methadone 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34efc1c3a2d8209ce45d31de375c52a3cb0fa3d8
-  data.tar.gz: 957eeb5f82278810774d35308356768ca4e038c8
+  metadata.gz: 6de444d578e8db3bbaa2a7b3895b88f145b83b28
+  data.tar.gz: d7be790577cc1d22c2cbb75e7ec51cb90a6aac52
 SHA512:
-  metadata.gz: e796c7cb5fa1980a1a1ca09ce3bb68f0c2c48acdd4e2ce9f5f3c95d1aea33654ee549b8b204bdae387b9c89aa3188496703a87366d93e4d97e1994f5a254c98a
-  data.tar.gz: 68e86c8dcb4f412282af3fc9056e73a56b5dfe03d791509fd04c94d960cfb90f576d4541c457bae1c2fe02547f991d37b376d604277c441e09cf756ae69b4e86
+  metadata.gz: ffc0b213b1a251cdea19c2332d3272b326e4e90cf97f7a6618f48946a91a9c93df85ab961ebc39131859dea1fd03bfbd5c39606742adae5f5abc3a5e0990d142
+  data.tar.gz: 1067d5c60c27688248623630168081ca78c347eb1abdbb71cad223513be28b9c53b0f8e5b70f10f8ea0aa0d2d39573b819cba699d266920fd9e8ca6490accba1

data/.travis.yml

@@ -5,9 +5,7 @@ script: 'bundle exec rake'
 rvm:
   - 1.9.2
   - 1.9.3
-  - 1.8.7
   - 2.0.0
   - 2.1.0
-  - ree
   - jruby-18mode
   - jruby-19mode

data/bin/methadone

@@ -85,7 +85,7 @@ on("--force","Overwrite files if they exist")
 on("--[no-]readme","[Do not ]produce a README file")
 on("--rspec", "Generate RSpec unit tests instead of Test::Unit")
 
-licenses = %w(mit apache custom NONE)
+licenses = %w(mit apache gplv2 gplv3 custom NONE)
 on("-l LICENSE","--license",licenses,"Specify the license for your project",'(' + licenses.join('|') + ')')
 
 use_log_level_option

data/features/license.feature

@@ -20,6 +20,18 @@ Feature: Users should get the license included
       |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|
+      |mit|
+      |gplv2|
+      |gplv3|
 
   Scenario: We only support a few licenses
     When I run `methadone -l foobar tmp/newgem`

data/features/step_definitions/license_steps.rb

@@ -22,3 +22,8 @@ Then /^the README should reference the need for a license$/ do
   step %(the file "tmp/newgem/README.rdoc" should match /License:: INSERT LICENSE HERE/)
 end
 
+Then(/^LICENSE\.txt should contain user information and program name$/) do
+  step %(the file "tmp/newgem/LICENSE.txt" should match /#{`git config user.name`}/)
+  step %(the file "tmp/newgem/LICENSE.txt" should match /newgem/)
+  step %(the file "tmp/newgem/LICENSE.txt" should match /#{Time.now.year}/)
+end

data/lib/methadone/cli.rb

@@ -98,5 +98,19 @@ module Methadone
       }
     end
 
+    def render_license_partial(partial)
+      ERB.new(File.read(template_dir('full/'+partial))).result(binding).strip 
+    end
+
+    def gemspec
+      @gemspec || @gemspec=_get_gemspec
+    end
+    private
+    def _get_gemspec
+      files=Dir.glob("*.gemspec")
+      raise "Multiple gemspec files" if files.size>1
+      raise "No gemspec file" if files.size < 1
+      Gem::Specification::load(files.first)
+    end
   end
 end

data/lib/methadone/version.rb

@@ -1,3 +1,3 @@
 module Methadone #:nodoc:
-  VERSION = "1.3.2" #:nodoc:
+  VERSION = "1.4.0" #:nodoc:
 end

data/templates/full/_license_head.txt.erb

@@ -0,0 +1,2 @@
+Name: <%= gemspec.name %><%#TODO: Get program name more efficiently  -%>
+Copyright (c) <%= Time.now.year %> <%=`git config user.name`.strip %>

data/templates/full/apache_LICENSE.txt.erb

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+      Copyright <%= Time.now.year %> <%=`git config.user` %>
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/templates/full/gplv2_LICENSE.txt.erb

@@ -0,0 +1,14 @@
+<%= render_license_partial('_license_head.txt.erb') %>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, see <http://www.gnu.org/licenses/>.

data/templates/full/gplv3_LICENSE.txt.erb

@@ -0,0 +1,15 @@
+<%= render_license_partial('_license_head.txt.erb') %>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+

data/templates/full/mit_LICENSE.txt.erb

@@ -1,4 +1,4 @@
-Copyright (c) <%= Time.now.year %> YOUR NAME 
+<%= render_license_partial('_license_head.txt.erb') %>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: methadone
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - davetron5000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -217,12 +217,15 @@ files:
 - templates/full/.gitignore.erb
 - templates/full/README.rdoc.erb
 - templates/full/Rakefile.erb
+- templates/full/_license_head.txt.erb
 - templates/full/apache_LICENSE.txt.erb
 - templates/full/bin/executable.erb
 - templates/full/custom_LICENSE.txt.erb
 - templates/full/features/executable.feature.erb
 - templates/full/features/step_definitions/executable_steps.rb.erb
 - templates/full/features/support/env.rb.erb
+- templates/full/gplv2_LICENSE.txt.erb
+- templates/full/gplv3_LICENSE.txt.erb
 - templates/full/mit_LICENSE.txt.erb
 - templates/rspec/spec/something_spec.rb.erb
 - templates/test_unit/test/tc_something.rb.erb