sunzi-rails 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7f44f28aa95282d1a88cde6e22885945640a974
-  data.tar.gz: b6b2087b17921902334080ac14a2b0fea88a94b4
+  metadata.gz: 2d03b75fe1c7d8f129069b287f1d64e46aa6ba29
+  data.tar.gz: daa7d0114dd22da0251adc7f738a7f15fd07a788
 SHA512:
-  metadata.gz: 1d81a1e47fc978b8ab651e65e1a803b92c24ad37131744a2e3d71a139a1ba5029747fed5082832cd4be8c7eb91b9e5a26e63fd1fbe217d661f233d4e2f644051
-  data.tar.gz: 9a24f3995e7fc00ce1803e7aca0eecca6c0f24d38484c040a76dc64232247b336c80e8b27b9795b018ff3a6d1a6889ebd045f2a68a7067d4d1c62b18b006d89d
+  metadata.gz: d81e751fd668b6c99fa62d9be415f838e2d883427e9e6eb83e37c53a4969cea3fd9a5b871ab49e071d69e98cda09acb4ae1e519a2ae201c726e4772a00c93e83
+  data.tar.gz: 2397b6762795da467926f7e7bbc7d80e64894760b02c5ee8364f49c08135a6ed66f37270e89be012182720b49ca97db0f0cf63abf0b15775511a85ddd32c17b6

data/lib/sunzi/cli/capistrano.rb

@@ -13,9 +13,6 @@ module Sunzi
       @env = HashWithIndifferentAccess.new(@env)
     end
 
-    def lock(version); end
-    def namespace(options = {}); end
-
     def set(key, value)
       @env[key] = value
     end

data/lib/templates/create/roles/admin.sh

@@ -5,8 +5,12 @@ start=$(sunzi.start_time)
 source recipes/setup.sh
 source recipes/libraries.sh
 source recipes/nodejs.sh
+<% case @attributes.db_adapter -%>
+<% when 'postgresql' -%>
 source recipes/postgres.sh
-# source recipes/mysql.sh
+<% when 'mysql', 'mysql2' -%>
+source recipes/mysql.sh
+<% end -%>
 source recipes/passenger.sh
 source recipes/user.sh
 # source recipes/sysstat.sh

data/sunzi.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'sunzi-rails'
-  spec.version       = '0.2.0' # retrieve this value by: Gem.loaded_specs['sunzi'].version.to_s
+  spec.version       = '0.2.1' # retrieve this value by: Gem.loaded_specs['sunzi'].version.to_s
   spec.authors       = ['Kenn Ejima', 'Patrice Lebel']
   spec.email         = ['kenn.ejima@gmail.com']
   spec.homepage      = 'http://github.com/o2web/sunzi-rails'
@@ -10,15 +10,16 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Server provisioning utility for minimalists}
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "bin"
+  spec.executables   = ["sunzi-cap"]
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency 'rails', "~> 4.2", ">= 4.2.0"
 
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'rainbow'
   spec.add_runtime_dependency 'net-ssh'
-  spec.add_runtime_dependency 'rails', "~> 4.2", ">= 4.2.0"
 
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunzi-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Kenn Ejima
@@ -12,21 +12,27 @@ cert_chain: []
 date: 2016-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -40,7 +46,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-ssh
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,25 +60,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -140,9 +140,6 @@ files:
 - lib/templates/create/roles/updater.sh
 - lib/templates/create/sunzi.yml
 - sunzi.gemspec
-- test/sunzi_test_dir/files/nginx/nginx.conf
-- test/sunzi_test_dir/recipes/nginx.sh
-- test/test_cli.rb
 homepage: http://github.com/o2web/sunzi-rails
 licenses:
 - MIT
@@ -167,8 +164,5 @@ rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Server provisioning utility for minimalists
-test_files:
-- test/sunzi_test_dir/files/nginx/nginx.conf
-- test/sunzi_test_dir/recipes/nginx.sh
-- test/test_cli.rb
+test_files: []
 has_rdoc: 

data/test/test_cli.rb

@@ -1,52 +0,0 @@
-require 'sunzi'
-require 'minitest/autorun'
-
-class TestCli < Minitest::Test
-  def setup
-    @cli = Sunzi::Cli.new
-  end
-
-  def test_parse_target
-    assert_equal ['user', 'example.com', '2222'], @cli.parse_target('user@example.com:2222')
-    assert_equal ['root', 'example.com', '2222'], @cli.parse_target('example.com:2222')
-    assert_equal ['user', 'example.com', '22'],   @cli.parse_target('user@example.com')
-    assert_equal ['root', 'example.com', '22'],   @cli.parse_target('example.com')
-    assert_equal ['root', '192.168.0.1', '22'],   @cli.parse_target('192.168.0.1')
-  end
-
-  def test_parse_target_with_ssh_config
-    ssh_config = lambda do |host|
-      if host == 'example.com'
-        { :host_name => "buzz.example.com", :user => "foobar", :port => 2222 }
-      else
-        {}
-      end
-    end
-
-    Net::SSH::Config.stub(:for, ssh_config) do
-      assert_equal ['foobar', 'buzz.example.com', '2222'], @cli.parse_target('example.com')
-      assert_equal ['foobar', 'buzz.example.com', '8080'], @cli.parse_target('example.com:8080')
-      assert_equal ['piyo', 'buzz.example.com', '2222'], @cli.parse_target('piyo@example.com')
-      assert_equal ['piyo', 'buzz.example.com', '8080'], @cli.parse_target('piyo@example.com:8080')
-      assert_equal ['root', '192.168.0.1', '22'], @cli.parse_target('192.168.0.1')
-    end
-  end
-
-  def test_create
-    @cli.create
-    assert File.exist?('config/sunzi/sunzi.yml')
-    FileUtils.rm_rf 'config/sunzi'
-  end
-
-  def test_copy_local_files
-    pwd = Dir.pwd
-    Dir.chdir('test/sunzi_test_dir')
-
-    @cli.copy_local_files({}, :copy_file)
-    assert File.exists?('compiled/files/nginx/nginx.conf')
-    assert File.exists?('compiled/recipes/nginx.sh')
-    FileUtils.rm_rf 'compiled'
-
-    Dir.chdir(pwd)
-  end
-end