methadone 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62d6b61845648eb9ef67b68270c29d36a36b75c3
-  data.tar.gz: 93950790b307186c6dca1bd70978e80ac53135a1
+  metadata.gz: 28edf03f317826eca04da77d8a6fb3bf4fb0c977
+  data.tar.gz: 64b4d8b287ec915faee422425d9054ef79f95b73
 SHA512:
-  metadata.gz: a80f01dde40c877f514314d07ded91187d7b9e2ee8c913f1bbdf918b0fc96303a18930e33e513ce3c1b7d2e07f4cb344ef5561a515c89ff6e9825a6b87fdc5b5
-  data.tar.gz: 9395294305318487bc0f653afbcefab6f184e77654c7a92d3db020508c7c37aac8f085fc2c43bb17de722b69252333d6e8cf64d1e9b9a0815c35183664112621
+  metadata.gz: 1e4c6b2c4b41d4f25b6d60c1dc8a2975da51a39cc62bb8073457b61a6c306043b177705f75f10c06cb62452a779730db5263616c7d9e35b5ae6886afe29d8229
+  data.tar.gz: 1a0e5f3bc306390de60e25f4a248dc5343e97362fdc4afd7a17a7c854069520af02d480287743a54eb3a7ff358174344d8ed0d718855e3aa5c708997ee1471bc

data/bin/methadone

@@ -50,10 +50,25 @@ main do |app_name|
   end
 
 
+  gemspec = "#{gemname}.gemspec"
+  gem_variable = File.open(gemspec) { |x| x.read }.match(/(\w+)\.executables/)[1]
+
   license = options[:license]
   warn "warning: your app has no license" unless license
   license = nil if license == 'NONE'
-  copy_file "#{options[:license]}_LICENSE.txt", :as => "LICENSE.txt" if license
+  if license
+    copy_file "#{options[:license]}_LICENSE.txt", :as => "LICENSE.txt" 
+  else
+    #Remove the MIT license generated by `bundle gem`
+    debug "Making sure no LICENSE.txt file exists at the root of the repo"
+    FileUtils.rm_f "LICENSE.txt"
+  end
+
+  #Ensure the gemspec file mentions the correct license
+  gemspec_content = File.read(gemspec)
+  gemspec_content.gsub!(/(^\s*#{gem_variable}\.license\s*=\s*).*/,"\\1#{license.to_s.inspect}")
+  File.open(gemspec,'w') {|f| f.write gemspec_content }
+
 
   copy_file "README.rdoc", :binding => binding if using_readme
 
@@ -61,8 +76,6 @@ main do |app_name|
   copy_file "features/step_definitions/executable_steps.rb", :as => "#{gemname}_steps.rb"
   copy_file "bin/executable", :as => gemname, :executable => true, :binding => binding
 
-  gemspec = "#{gemname}.gemspec"
-  gem_variable = File.open(gemspec) { |x| x.read }.match(/(\w+)\.executables/)[1]
   add_to_file gemspec, [
     "  #{gem_variable}.add_development_dependency('rdoc')",
     "  #{gem_variable}.add_development_dependency('aruba')",
@@ -75,6 +88,8 @@ main do |app_name|
     "  #{gem_variable}.add_development_dependency('rspec', '~> 2.99')",
     ], :before => /^end\s*$/
   end
+
+  sh! %q(git add --all .)
 end
 
 options[:readme] = true

data/features/bootstrap.feature

@@ -148,3 +148,10 @@ Feature: Bootstrap a new command-line app
     And the banner should document that this app's arguments are:
       |app_name|which is required|
     And there should be a one line summary of what the app does
+
+  Scenario: The whole initial state of the app has been staged with git
+    Given I successfully run `methadone -l custom tmp/newgem`
+    And I cd to "tmp/newgem"
+    When I successfully run `git ls-files --others --deleted `
+    Then the output should match /\A\Z/
+

data/features/license.feature

@@ -11,29 +11,6 @@ Feature: Users should get the license included
     Then newgem's license should be an empty file
     And the README should reference the need for a license
 
-  Scenario Outline: Include one of a few stock licenses
-    When I successfully run `methadone -l <license> tmp/newgem`
-    Then newgem's license should be the <license> license
-    And the README should reference this license
-
-    Examples:
-      |license|
-      |apache|
-      |mit|
-      |gplv2|
-      |gplv3|
-
-  Scenario Outline: Stock licenses should be personalized
-    When I successfully run `methadone -l <license> tmp/newgem`
-    Then LICENSE.txt should contain user information and program name
-
-    Examples:
-      |license|
-      |apache|
-      |mit|
-      |gplv2|
-      |gplv3|
-
   Scenario: We only support a few licenses
     When I run `methadone -l foobar tmp/newgem`
     Then the exit status should not be 0
@@ -43,8 +20,24 @@ Feature: Users should get the license included
     When I successfully run `methadone tmp/newgem`
     Then the stderr should contain "warning: your app has no license"
     And the README should not reference a license
+    And the file "tmp/newgem/LICENSE.txt" should not exist
 
   Scenario: No license specified explicitly
     When I successfully run `methadone -l NONE tmp/newgem`
     Then the stderr should not contain "warning: your app has no license"
     And the README should not reference a license
+    And the file "tmp/newgem/LICENSE.txt" should not exist
+
+  Scenario Outline: Include one of a few stock licenses
+    When I successfully run `methadone -l <license> tmp/newgem`
+    Then newgem's license should be the <license> license
+    And the README should reference this license
+    And LICENSE.txt should contain user information and program name
+
+    Examples:
+      |license|
+      |apache|
+      |mit|
+      |gplv2|
+      |gplv3|
+

data/features/step_definitions/license_steps.rb

@@ -5,6 +5,7 @@ end
 Then /^newgem's license should be the (\w+) license/ do |license|
   @license = license
   step %(a file named "tmp/newgem/LICENSE.txt" should exist)
+  step %(the file "tmp/newgem/newgem.gemspec" should match /#{@license}/)
 end
 
 Then /^the README should reference this license$/ do

data/lib/methadone/version.rb

@@ -1,3 +1,3 @@
 module Methadone #:nodoc:
-  VERSION = "1.5.1" #:nodoc:
+  VERSION = "1.6.0" #:nodoc:
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: methadone
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - davetron5000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler