Skip to content

Shorten markdown to md and fix markdown issue #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndyObtiva wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Shorten markdown to md and fix markdown issue #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b757dbe
Fixed dependency on test_construct
AndyObtiva Jun 2, 2020
cc0141c
Fixed broken test for generator constant_name
AndyObtiva Jun 2, 2020
c6ad56d
Updated generator bundler dependency to >= 1.0
AndyObtiva Jun 2, 2020
b0b57c0
Shorten README.markdown extension to md and fix markdown file title/s…
AndyObtiva Jan 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions lib/juwelier/generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def initialize(options = {})

development_dependencies << ["cucumber", ">= 0"] if should_use_cucumber

development_dependencies << ["bundler", "~> 1.0"]
development_dependencies << ["bundler", ">= 1.0"]
development_dependencies << ["juwelier", "~> #{Juwelier::Version::STRING}"]
development_dependencies << ["simplecov", ">= 0"]

Expand Down Expand Up @@ -154,7 +154,7 @@ def run
end

def constant_name
self.project_name.camel
self.project_name.snake.camel
end

def extension_name
Expand Down Expand Up @@ -208,7 +208,10 @@ def create_files

output_template_in_target '.gitignore'
output_template_in_target 'Rakefile'
output_template_in_target 'Gemfile' if should_use_bundler
if should_use_bundler
output_template_in_target 'Gemfile'
system 'bundle install'
end
output_template_in_target 'LICENSE.txt'
output_template_in_target "README.#{use_readme_format}"
output_template_in_target '.document'
Expand Down
2 changes: 1 addition & 1 deletion lib/juwelier/generator/options.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ def initialize(args)
end

o.on('--markdown', 'use Markdown for the readme') do
self[:readme_format] = :markdown
self[:readme_format] = :md
end

o.on('-v', '--version', 'show version') do
Expand Down
9 changes: 3 additions & 6 deletions lib/juwelier/templates/README.markdown → lib/juwelier/templates/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<%= project_name %>
===================
# <%= project_name %>

Description goes here.

Contributing to <%= project_name %>
------------------------------------------
## Contributing to <%= project_name %>

- Check out the latest master to make sure the feature hasn't been
implemented or the bug hasn't been fixed yet.
Expand All @@ -20,8 +18,7 @@ Contributing to <%= project_name %>
is fine, but please isolate to its own commit so I can cherry-pick
around it.

Copyright
---------
## Copyright

Copyright (c) <%= Time.now.year %> <%= user_name %>. See
LICENSE.txt for further details.
4 changes: 2 additions & 2 deletions test/test_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
require 'rake'
require 'shoulda'
#require 'redgreen'
require 'construct'
require 'test_construct'
require 'git'
require 'time'

Expand All @@ -39,7 +39,7 @@ def initialize
end

class Test::Unit::TestCase
include Construct::Helpers
include TestConstruct::Helpers

def tmp_dir
TMP_DIR
Expand Down