padrino-gen 0.13.0.beta1 → 0.13.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3417ec67988324174088f6cfd71fa88935bbcf24
-  data.tar.gz: 06002f5bc93956942455fbefac8140fb872eda77
+  metadata.gz: eb6b8990a21282c06f0e7e0727d62ec5470fa604
+  data.tar.gz: 72044379f1f848294dfca02672199f5890382eb2
 SHA512:
-  metadata.gz: 49b82476e19803ba0e284519518058ae101d48b26c5d8f66fdf720734d912a958d40feed06952e488af063eb6c6bdca937b8a34e33b1c53c3acde215c26658bd
-  data.tar.gz: 7cf1ff30dda912f122dc8b08c4f0de46a54e44aef97b3c244ef5205176fde6e7b1fa415b1591496835958a174b729f91df7989ae70e587ecdf4429f379740781
+  metadata.gz: 8b810a9cdbd38cfa1ad0122a55610c5f036fb9890c5983c255942b490c036d45bbb18e1a1576b0fda731af4dd27122a5ddb1c65f0168a00af95b05b1bb358130
+  data.tar.gz: e7aeb4b08d77b333116225c30513822e035b1b99202571bd4a127b09cbdca1618f507487a17699c8f39ebd0a81352749d852046a9f30e8fee9233f07ae26afa5

data/README.rdoc

@@ -160,4 +160,4 @@ To learn more about the mailer generator, check out the guide to
 
 == Copyright
 
-Copyright (c) 2011-2013 Padrino. See LICENSE for details.
+Copyright (c) 2011-2015 Padrino. See LICENSE for details.

data/lib/padrino-gen/generators/components/stylesheets/compass.rb

@@ -31,7 +31,7 @@ COMPASS_REGISTER = <<-COMPASSR unless defined?(COMPASS_REGISTER)
 COMPASSR
 
 def setup_stylesheet
-  require_dependencies 'compass'
+  require_dependencies 'compass-blueprint'
   create_file destination_root('/lib/compass_plugin.rb'), COMPASS_INIT
   inject_into_file destination_root('/app/app.rb'), COMPASS_REGISTER, :after => "register Padrino::Helpers\n"
 

data/lib/padrino-gen/padrino-tasks/activerecord.rb

@@ -121,17 +121,17 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
       end
     end
 
-    desc "Migrate the database through scripts in db/migrate and update db/schema.rb by invoking ar:schema:dump. Target specific version with VERSION=x. Turn off output with VERBOSE=false."
+    desc "Migrate the database through scripts in db/migrate and update db/schema.rb by invoking ar:schema:dump. Target specific version with MIGRATION_VERSION=x. Turn off output with VERBOSE=false."
     task :migrate => :skeleton do
       ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-      ActiveRecord::Migrator.migrate("db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
+      ActiveRecord::Migrator.migrate("db/migrate/", env_migration_version)
       Rake::Task["ar:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
     end
 
     namespace :migrate do
-      desc 'Rollbacks the database one migration and re migrate up. If you want to rollback more than one step, define STEP=x. Target specific version with VERSION=x.'
+      desc 'Rollbacks the database one migration and re migrate up. If you want to rollback more than one step, define STEP=x. Target specific version with MIGRATION_VERSION=x.'
       task :redo => :skeleton do
-        if ENV["VERSION"]
+        if env_migration_version
           Rake::Task["ar:migrate:down"].invoke
           Rake::Task["ar:migrate:up"].invoke
         else
@@ -143,10 +143,10 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
       desc 'Resets your database using your migrations for the current environment'
       task :reset => ["ar:drop", "ar:create", "ar:migrate"]
 
-      desc 'Runs the "up" for a given migration VERSION.'
+      desc 'Runs the "up" for a given MIGRATION_VERSION.'
       task(:up => :skeleton){ migrate_as(:up) }
 
-      desc 'Runs the "down" for a given migration VERSION.'
+      desc 'Runs the "down" for a given MIGRATION_VERSION.'
       task(:down => :skeleton){ migrate_as(:down) }
     end
 
@@ -349,8 +349,8 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
   end
 
   def migrate_as(type)
-    version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
-    raise "VERSION is required" unless version
+    version = env_migration_version
+    fail "MIGRATION_VERSION is required" unless version
     ActiveRecord::Migrator.run(type, "db/migrate/", version)
     dump_schema
   end

data/lib/padrino-gen/padrino-tasks/datamapper.rb

@@ -24,14 +24,14 @@ if PadrinoTasks.load?(:datamapper, defined?(DataMapper))
 
       desc "Migrate up using migrations"
       task :up, [:version] => :load do |t, args|
-        version = args[:version] || ENV['VERSION']
+        version = args[:version] || env_migration_version
         migrate_up!(version)
         puts "<= dm:migrate:up #{version} executed"
       end
 
       desc "Migrate down using migrations"
       task :down, [:version] => :load do |t, args|
-        version = args[:version] || ENV['VERSION']
+        version = args[:version] || env_migration_version
         migrate_down!(version)
         puts "<= dm:migrate:down #{version} executed"
       end

data/lib/padrino-gen/padrino-tasks/sequel.rb

@@ -9,11 +9,11 @@ if PadrinoTasks.load?(:sequel, defined?(Sequel))
         puts "<= sq:migrate:auto executed"
       end
 
-      desc "Perform migration up/down to VERSION"
+      desc "Perform migration up/down to MIGRATION_VERSION"
       task :to, [:version] => :skeleton do |t, args|
-        version = (args[:version] || ENV['VERSION']).to_s.strip
+        version = (args[:version] || env_migration_version).to_s.strip
         ::Sequel.extension :migration
-        raise "No VERSION was provided" if version.empty?
+        fail "No MIGRATION_VERSION was provided" if version.empty?
         ::Sequel::Migrator.apply(Sequel::Model.db, "db/migrate", version.to_i)
         puts "<= sq:migrate:to[#{version}] executed"
       end

data/test/test_project_generator.rb

@@ -663,7 +663,7 @@ describe "ProjectGenerator" do
 
     it 'should properly generate for compass' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--renderer=haml','--script=none','--stylesheet=compass') }
-      assert_match_in_file(/gem 'compass'/, "#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/gem 'compass-blueprint'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/Compass.configure_sass_plugin\!/, "#{@apptmp}/sample_project/lib/compass_plugin.rb")
       assert_match_in_file(/module CompassInitializer.*Sass::Plugin::Rack/m, "#{@apptmp}/sample_project/lib/compass_plugin.rb")
       assert_match_in_file(/register CompassInitializer/m, "#{@apptmp}/sample_project/app/app.rb")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-gen
 version: !ruby/object:Gem::Version
-  version: 0.13.0.beta1
+  version: 0.13.0.beta2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-22 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta1
+        version: 0.13.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta1
+        version: 0.13.0.beta2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -47,28 +47,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta1
+        version: 0.13.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta1
+        version: 0.13.0.beta2
 - !ruby/object:Gem::Dependency
   name: padrino-mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta1
+        version: 0.13.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta1
+        version: 0.13.0.beta2
 description: Generators for easily creating and building padrino applications from
   the console
 email: padrinorb@gmail.com