wslave 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 645da0b0768a178ac500a481cab287bdb5a25050
-  data.tar.gz: 87a86964187ce77940adef285c5682114065511d
+  metadata.gz: ba6ee752d365aeb960d4560e6f1fb5fdece0821a
+  data.tar.gz: a828906fb12e94bca09cda0443686f7fe8866431
 SHA512:
-  metadata.gz: 96dd98f69018d8dd5fd4f41f3cdd7ce07595975244afffb0a1ce51c40c197acfd47f8f3d504df3fcb2fc51245945401f5dbddc04efb55c349e6a348ccc1f2b78
-  data.tar.gz: 5df29223a9c70406449753695242fcf017244e67cc3f98a2a9e8bf94238ec221a199adc0e68327e5ae001d34a9f822f554ea1830cd0fd794e5d947da08407c3d
+  metadata.gz: 68e7f8d654e4a590a2c4160501199efa955883fd44e5f334613cbe807a0f489d739d87bf910392798d17ceff5bfa793c5879075d6fd04e0c2eaf9760858783e9
+  data.tar.gz: f2a5b72f3280e6d1e54cb0d9df0f5655b879314ff666789c5a4a044814308978610ccc61f1ebb62ba7659cce7b32a43f18690b22c20933376ff6b47dcce4ac7b

data/base/Capfile

@@ -1,10 +1,24 @@
-require "capistrano/setup"
+require 'capistrano/setup'
+require 'capistrano/deploy'
+require 'yaml'
 
-require "capistrano/deploy"
+opts = YAML.load_file('config/definitions.yml')
 
-require "capistrano/scm/git"
-install_plugin Capistrano::SCM::Git
-require "capistrano/scm/git-with-submodules"
-install_plugin Capistrano::SCM::Git::WithSubmodules
+deploy_method = 'git-with-submodules'
+deploy_method = opts['options']['deploy_method'] if (opts.has_key?('options') &&
+  opts['options'].has_key?('deploy_method'))
+
+case deploy_method
+when 'scp'
+  require 'capistrano/copy'
+when 'git'
+  require 'capistrano/scm/git'
+  install_plugin Capistrano::SCM::Git
+else
+  require 'capistrano/scm/git'
+  install_plugin Capistrano::SCM::Git
+  require 'capistrano/scm/git-with-submodules'
+  install_plugin Capistrano::SCM::Git::WithSubmodules
+end
 
 Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }

data/base/config/deploy.rb

@@ -1,9 +1,17 @@
 # config valid only for current version of Capistrano
 lock "3.9.1"
 
-
 require 'yaml'
 opts = YAML.load_file('config/definitions.yml')
 
 set :application, opts['app']['name']
 set :repo_url, opts['app']['repo']
+
+deploy_method = opts['options']['deploy_method'] if opts.has_key?('options') &&
+  opts['options'].has_key?('deploy_method')
+
+case deploy_method
+when 'scp'
+  set :scm, :copy
+else
+end

data/templates/config/definitions.yml

@@ -10,3 +10,5 @@ deployer:
 app:
   name:
   repo:
+options:
+  deploy_method: git-with-submodules # Choose from: git-with-submodules, git, scp

data/wslave.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'wslave'
-  s.version     = '0.0.9'
+  s.version     = '0.0.10'
   s.licenses     = ['GPL-3.0', 'AGPL-3.0']
   s.summary     = '"Word Slave" generates and controls a WordPress installation'
   s.description = 'Word Slave includes the wslave command and a control library to generate a ' \
@@ -20,8 +20,10 @@ Gem::Specification.new do |s|
   s.bindir = 'bin'
   s.executables << 'wslave'
 
-  s.add_dependency 'thor'
-  s.add_dependency 'haikunator'
   s.add_dependency 'capistrano', '= 3.9.1'
   s.add_dependency 'capistrano-git-with-submodules', '~> 2.0'
+  s.add_dependency 'capistrano-scm-copy', '~> 0.7'
+
+  s.add_dependency 'thor', '~> 0.20'
+  s.add_dependency 'haikunator', '~> 1.1'
 end

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: wslave
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-17 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.9.1
 - !ruby/object:Gem::Dependency
-  name: haikunator
+  name: capistrano-git-with-submodules
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: capistrano
+  name: capistrano-scm-copy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.1
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.1
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: capistrano-git-with-submodules
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.20'
+- !ruby/object:Gem::Dependency
+  name: haikunator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: Word Slave includes the wslave command and a control library to generate
   a "best practice" WordPress installation and includes a pre-rolled Docker setup
   for running a development server and a Capistrano setup for deployment.
@@ -79,6 +93,7 @@ files:
 - base/Dockerfile
 - base/Gemfile
 - base/Rakefile
+- base/config/.deploy.rb.swp
 - base/config/deploy-tools/gen-salts.rb
 - base/config/deploy-tools/gen-wp-config.rb
 - base/config/deploy-tools/wp-config.php.erb