padrino-gen 0.7.1 → 0.7.2

data/Rakefile

@@ -15,7 +15,7 @@ begin
     gem.executables = ["padrino-gen"]
     gem.add_runtime_dependency     "sinatra",       ">= 0.9.2"
     gem.add_runtime_dependency     "padrino-core",  "= #{GEM_VERSION}"
-    gem.add_runtime_dependency     "thor",          ">= 0.11.8"
+    gem.add_runtime_dependency     "thor",          ">= 0.13.0"
     gem.add_runtime_dependency     "bundler",       ">= 0.5.0"
     gem.add_development_dependency "haml",          ">= 2.2.1"
     gem.add_development_dependency "shoulda",       ">= 0"

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/bin/padrino-gen

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-%w[rubygems thor].each { |gem| require gem }
+%w[rubygems thor/group].each { |gem| require gem }
 $:.unshift File.dirname(__FILE__) + "/../lib"
 
 # We try to load the vendored padrino-core if exist

data/lib/padrino-gen/generators/actions.rb

@@ -104,9 +104,7 @@ module Padrino
         gem_options = options.slice(:only, :require_as).collect { |k, v| "#{k.inspect} => #{v.inspect}" }.join(", ")
         include_text = "gem '#{name}'" << (gem_options.present? ? ", #{gem_options}" : "") << "\n"
         options.merge!(:content => include_text, :after => after_pattern)
-        if behavior == :revoke || !File.read(destination_root('Gemfile')).include?(options[:content])
-          inject_into_file('Gemfile', options[:content], :after => options[:after])
-        end
+        inject_into_file('Gemfile', options[:content], :after => options[:after])
       end
 
       module ClassMethods

data/lib/padrino-gen/generators/app.rb

@@ -1,5 +1,3 @@
-require 'thor'
-
 module Padrino
   module Generators
     class App < Thor::Group

data/lib/padrino-gen/generators/controller.rb

@@ -1,5 +1,3 @@
-require 'thor'
-
 module Padrino
   module Generators
 

data/lib/padrino-gen/generators/mailer.rb

@@ -1,5 +1,3 @@
-require 'thor'
-
 module Padrino
   module Generators
 

data/lib/padrino-gen/generators/migration.rb

@@ -1,5 +1,3 @@
-require 'thor'
-
 module Padrino
   module Generators
 

data/lib/padrino-gen/generators/model.rb

@@ -1,5 +1,3 @@
-require 'thor'
-
 module Padrino
   module Generators
 

data/padrino-gen.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
@@ -98,8 +98,8 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.7.1"])
-      s.add_runtime_dependency(%q<thor>, [">= 0.11.8"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.7.2"])
+      s.add_runtime_dependency(%q<thor>, [">= 0.13.0"])
       s.add_runtime_dependency(%q<bundler>, [">= 0.5.0"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
@@ -109,8 +109,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<fakeweb>, [">= 1.2.3"])
     else
       s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_dependency(%q<padrino-core>, ["= 0.7.1"])
-      s.add_dependency(%q<thor>, [">= 0.11.8"])
+      s.add_dependency(%q<padrino-core>, ["= 0.7.2"])
+      s.add_dependency(%q<thor>, [">= 0.13.0"])
       s.add_dependency(%q<bundler>, [">= 0.5.0"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
@@ -121,8 +121,8 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-    s.add_dependency(%q<padrino-core>, ["= 0.7.1"])
-    s.add_dependency(%q<thor>, [">= 0.11.8"])
+    s.add_dependency(%q<padrino-core>, ["= 0.7.2"])
+    s.add_dependency(%q<thor>, [">= 0.13.0"])
     s.add_dependency(%q<bundler>, [">= 0.5.0"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])

data/test/helper.rb

@@ -4,7 +4,7 @@ require 'shoulda'
 require 'mocha'
 require 'rack/test'
 require 'webrat'
-require 'thor'
+require 'thor/group'
 
 # We try to load the vendored padrino-core if exist
 %w(core).each do |gem|

data/test/test_app_generator.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/helper'
-require 'thor'
+require 'thor/group'
 require 'fakeweb'
 
 class TestAppGenerator < Test::Unit::TestCase

data/test/test_controller_generator.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/helper'
-require 'thor'
+require 'thor/group'
 
 class TestControllerGenerator < Test::Unit::TestCase
   def setup

data/test/test_mailer_generator.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/helper'
-require 'thor'
+require 'thor/group'
 
 class TestMailerGenerator < Test::Unit::TestCase
   def setup

data/test/test_migration_generator.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/helper'
-require 'thor'
+require 'thor/group'
 
 class TestMigrationGenerator < Test::Unit::TestCase
   def setup

data/test/test_model_generator.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/helper'
-require 'thor'
+require 'thor/group'
 
 class TestModelGenerator < Test::Unit::TestCase
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Padrino Team
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.7.1
+        version: 0.7.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.11.8
+        version: 0.13.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: bundler