padrino-gen 0.14.0.rc2 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e094b4fad7aaec458ffb7fc5af7b3a639737154c
-  data.tar.gz: 67a01738c4c1455dcee511ebfb743f1e37d24466
+  metadata.gz: 4138bbcbdcadc769e9510f5083b5016fd769bf05
+  data.tar.gz: 5d6b70a31a26945844aaf168e27d6e7b78fa491f
 SHA512:
-  metadata.gz: 9d1430a6fd2045c64d4c172c8b0c795ec471ab40aed1474d2df4e74943276158bac862e9d4f57d82e46b8678d2deff4f59fbdaf767d0aff47b26082be85e5b12
-  data.tar.gz: 0f41807dc776ecee3f6210a265cf88357640faaf318345c099723c785829a29d93ec6ee3b2ea276516b14332c203798e2975145ec0da33d08b72554e67250770
+  metadata.gz: 16fd35b05e17a89c330e31616da496000eff05ab162175924e2ded8771c3a266cb518395650c1ce04cf65dd1c182ded17ace452201a661977328e56a38013891
+  data.tar.gz: 5f6bf52c3c151382f67baa20a48036d8cb8e2f0b3d81a0edfbee9d459f8646c60c1809e80cab3e55c9ca5b0cbde6691bd446907c3decc7fc95a052bf11460c19

data/lib/padrino-gen/generators/components/renderers/erb.rb

@@ -1,3 +1,3 @@
 def setup_renderer
-  require_dependencies 'erubis', :version => "~> 2.7.0"
+  require_dependencies 'erubi', :version => '~> 1.6'
 end

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

@@ -70,6 +70,7 @@ module Padrino
           File.chmod(0755, destination_root("exe/#{name}"))
           if options.gem?
             template 'templates/gem/gemspec.tt', destination_root(name + '.gemspec')
+            inject_into_file destination_root('Rakefile'), "require 'bundler/gem_tasks'\n", :after => "require 'bundler/setup'\n"
             template 'templates/gem/README.md.tt', destination_root('README.md')
             template 'templates/gem/lib/libname.tt', destination_root("lib/#{name}.rb")
             template 'templates/gem/lib/libname/version.tt', destination_root("lib/#{name}/version.rb")

data/lib/padrino-gen/padrino-tasks/sql-helpers.rb

@@ -7,7 +7,7 @@ module Padrino
         case adapter
           when 'postgres'
             environment = {}
-            environment['PGPASSWORD'] = password unless password.empty?
+            environment['PGPASSWORD'] = password unless password.nil? || password.empty?
 
             arguments = []
             arguments << "--encoding=#{charset}" if charset
@@ -18,7 +18,7 @@ module Padrino
             Process.wait Process.spawn(environment, 'createdb', *arguments)
           when 'mysql', 'mysql2'
             environment = {}
-            environment['MYSQL_PWD'] = password unless password.empty?
+            environment['MYSQL_PWD'] = password unless password.nil? || password.empty?
 
             arguments = []
             arguments << "--user=#{user}" if user
@@ -41,7 +41,7 @@ module Padrino
         case adapter
           when 'postgres'
             environment = {}
-            environment['PGPASSWORD'] = password unless password.empty?
+            environment['PGPASSWORD'] = password unless password.nil? || password.empty?
 
             arguments = []
             arguments << "--host=#{host}" if host
@@ -51,7 +51,7 @@ module Padrino
             Process.wait Process.spawn(environment, 'dropdb', *arguments)
           when 'mysql', 'mysql2'
             environment = {}
-            environment['MYSQL_PWD'] = password unless password.empty?
+            environment['MYSQL_PWD'] = password unless password.nil? || password.empty?
 
             arguments = []
             arguments << "--user=#{user}" if user

data/test/test_project_generator.rb

@@ -444,7 +444,7 @@ describe "ProjectGenerator" do
     it 'should properly generate for erb' do
       out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--renderer=erb', '--script=none') }
       assert_match(/applying.*?erb.*?renderer/, out)
-      assert_match_in_file(/gem 'erubis'/, "#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/gem 'erubi'/, "#{@apptmp}/sample_project/Gemfile")
     end
 
     it 'should properly generate for haml' do

data/test/test_sql_helpers.rb

@@ -0,0 +1,105 @@
+require File.expand_path(File.dirname(__FILE__) + "/helper")
+require File.expand_path(File.dirname(__FILE__) + "/../lib/padrino-gen/padrino-tasks/sql-helpers")
+
+describe "SqlHelpers" do
+  def setup
+    Process.expects(:wait)
+  end
+
+  describe "create_db" do
+    describe "postgres" do
+      it "does not set PGPASSWORD when password is nil" do
+        Process.expects(:spawn).with() do |environment, *args|
+          environment == {}
+        end
+        Padrino::Generators::SqlHelpers.create_db("postgres", nil, nil, nil, "database", nil, nil)
+      end
+
+      it "does not set PGPASSWORD when password is blank" do
+        Process.expects(:spawn).with() do |environment, *args|
+          environment == {}
+        end
+        Padrino::Generators::SqlHelpers.create_db("postgres", nil, "", nil, "database", nil, nil)
+      end
+
+      it "sets PGPASSWORD when password is present" do
+        Process.expects(:spawn).with() do |environment, *args|
+          environment == {"PGPASSWORD" => "hunter2"}
+        end
+        Padrino::Generators::SqlHelpers.create_db("postgres", nil, "hunter2", nil, "database", nil, nil)
+      end
+    end
+
+    describe "mysql" do
+      it "does not set MYSQL_PWD when password is nil" do
+        Process.expects(:spawn).with() do |environment, *args|
+          environment == {}
+        end
+        Padrino::Generators::SqlHelpers.create_db("mysql", nil, nil, nil, "database", nil, nil)
+      end
+
+      it "does not set MYSQL_PWD when password is blank" do
+        Process.expects(:spawn).with() do |environment, *args|
+          environment == {}
+        end
+        Padrino::Generators::SqlHelpers.create_db("mysql", nil, "", nil, "database", nil, nil)
+      end
+
+      it "sets MYSQL_PWD when password is present" do
+        Process.expects(:spawn).with() do |environment, *args|
+          environment == {"MYSQL_PWD" => "hunter2"}
+        end
+        Padrino::Generators::SqlHelpers.create_db("mysql", nil, "hunter2", nil, "database", nil, nil)
+      end
+    end
+  end
+
+  describe "drop_db" do
+    describe "postgres" do
+      it "does not set PGPASSWORD when password is nil" do
+        Process.expects(:spawn).with() do |environment, *args|
+          environment == {}
+        end
+        Padrino::Generators::SqlHelpers.drop_db("postgres", nil, nil, nil, "database")
+      end
+
+      it "does not set PGPASSWORD when password is blank" do
+        Process.expects(:spawn).with() do |environment, *args|
+          environment == {}
+        end
+        Padrino::Generators::SqlHelpers.drop_db("postgres", nil, "", nil, "database")
+      end
+
+      it "sets PGPASSWORD when password is present" do
+        Process.expects(:spawn).with() do |environment, *args|
+          environment == {"PGPASSWORD" => "hunter2"}
+        end
+        Padrino::Generators::SqlHelpers.drop_db("postgres", nil, "hunter2", nil, "database")
+      end
+    end
+
+    describe "mysql" do
+      it "does not set MYSQL_PWD when password is nil" do
+        Process.expects(:spawn).with() do |environment, *args|
+          environment == {}
+        end
+        Padrino::Generators::SqlHelpers.drop_db("mysql", nil, nil, nil, "database")
+      end
+
+      it "does not set MYSQL_PWD when password is blank" do
+        Process.expects(:spawn).with() do |environment, *args|
+          environment == {}
+        end
+        Padrino::Generators::SqlHelpers.drop_db("mysql", nil, "", nil, "database")
+      end
+
+      it "sets MYSQL_PWD when password is present" do
+        Process.expects(:spawn).with() do |environment, *args|
+          environment == {"MYSQL_PWD" => "hunter2"}
+        end
+        Padrino::Generators::SqlHelpers.drop_db("mysql", nil, "hunter2", nil, "database")
+      end
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-gen
 version: !ruby/object:Gem::Version
-  version: 0.14.0.rc2
+  version: 0.14.0
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-03-15 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.14.0.rc2
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.rc2
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -47,28 +47,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.rc2
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.rc2
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: padrino-mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.rc2
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.rc2
+        version: 0.14.0
 description: Generators for easily creating and building padrino applications from
   the console
 email: padrinorb@gmail.com
@@ -194,6 +194,7 @@ files:
 - test/test_model_generator.rb
 - test/test_plugin_generator.rb
 - test/test_project_generator.rb
+- test/test_sql_helpers.rb
 - test/test_task_generator.rb
 homepage: http://www.padrinorb.com
 licenses:
@@ -211,12 +212,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: 1.3.6
 requirements: []
 rubyforge_project: padrino-gen
-rubygems_version: 2.6.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Generators for easily creating and building padrino applications