Merge pull request #104 from CrCs2O4/master

Fix gem build licence warning

bin/methadone

@@ -57,7 +57,7 @@ main do |app_name|
   warn "warning: your app has no license" unless license
   license = nil if license == 'NONE'
   if license
-    copy_file "#{options[:license]}_LICENSE.txt", :as => "LICENSE.txt" 
+    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"
@@ -69,7 +69,7 @@ main do |app_name|
   if gemspec_content =~ /(^\s*#{gem_variable}\.license\s*=\s*).*/
     gemspec_content.gsub!(/(^\s*#{gem_variable}\.license\s*=\s*).*/,"\\1#{license.to_s.inspect}")
   else
-    gemspec_content.gsub!(/(^\s*#{gem_variable}\.name\s*=\s*.*)/,"\\1\n  #{gem_variable}.license=#{license.to_s.inspect}")
+    gemspec_content.gsub!(/(^\s*#{gem_variable}\.name\s*=\s*.*)/,"\\1\n#{"  #{gem_variable}.license".ljust(20)} = #{license.to_s.inspect.upcase}")
   end
   File.open(gemspec,'w') {|f| f.write gemspec_content }
 

features/step_definitions/license_steps.rb

@@ -5,7 +5,7 @@
 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}/)
+  step %(the file "tmp/newgem/newgem.gemspec" should match /#{@license.upcase}/)
 end
 
 Then /^the README should reference this license$/ do