capistrano-itamae 0.1.0.beta2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4135186881d5a879ab199b38961b1295c813f871
-  data.tar.gz: 895980b2cbc53f5e1b17897bee7521336780fbef
+  metadata.gz: ffd552581c7d265dc104b79be464e787bcdb1714
+  data.tar.gz: 3b0b4126665066b7126cef328c8664fa5c239c60
 SHA512:
-  metadata.gz: 6f020cea4f4535a124f5125fa846e8f2cdc04a6b3073451899aa1eaec9b0df5d767f02828c1b9a32142c1bb387fe96915ca6ac5e2287c215bdb2a978be9b4143
-  data.tar.gz: 5a1826650db3b06aea15b3ced1850799c0e4c6133099a5e8e8e283dc9f0073db8b84f600b879b19dab93d0bd8f47cf9ad3cffc6e1ac0e2484aac3349ec2eac7c
+  metadata.gz: af598ae50de65a57c7cfddd2397c132fcce52904de125cf1520905562812130561b18fa949d5793fc932dde0a3d35634c88aa4bd652c6b67865f85948118cca2
+  data.tar.gz: 28a88a81587e68f31e67fbcb517938fce78163a0cc1a2f15049bf43b54f4bf6ff5f6df5f3f30f47dfdf525dbac925dcdef12eb1d933bde148c6c06cddf0448b8

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## master
+[full changelog](http://github.com/sue445/capistrano-itamae/compare/v0.1.0...master)
+
+## v0.1.0
+* first release

data/Gemfile

@@ -2,11 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in capistrano-itamae.gemspec
 gemspec
-
-group :development do
-  gem 'vagrant', github: 'ryotarai/vagrant', branch: 'latest-bundler'
-end
-
-group :plugins do
-  gem 'vagrant-digitalocean'
-end

data/README.md

@@ -3,6 +3,7 @@
 Run [itamae](https://github.com/itamae-kitchen/itamae) in capistrano task
 
 [![Gem Version](https://badge.fury.io/rb/capistrano-itamae.svg)](https://badge.fury.io/rb/capistrano-itamae)
+[![Code Climate](https://codeclimate.com/github/sue445/capistrano-itamae/badges/gpa.svg)](https://codeclimate.com/github/sue445/capistrano-itamae)
 
 [![wercker status](https://app.wercker.com/status/a2f734cda581d3d221e10b1ede83bb71/m/master "wercker status")](https://app.wercker.com/project/bykey/a2f734cda581d3d221e10b1ede83bb71)
 
@@ -37,7 +38,7 @@ config/deploy.rb
 ```ruby
 set :itamae_cookbooks_path, "cookbooks"
 
-set :itamae_ssh_default_options, ["--node-yaml=node.yml"]
+set :itamae_ssh_default_options, "--node-yaml=node.yml"
 
 desc "Run itamae"
   task :itamae do
@@ -60,8 +61,7 @@ see [Capistrano::Itamae::DSL#itamae_ssh](lib/capistrano/itamae/dsl.rb)
 ## Variables
 * `itamae_cookbooks_path` : path to cookbooks dir (default: "cookbooks")
 * `itamae_bin_name` : itamae executable name (default: `itamae`)
-* `itamae_ssh_default_options` : `itamae ssh` default options (default: `[]`)
-  * If `options` is not passed, use this
+* `itamae_ssh_default_options` : `itamae ssh` default options (default: empty)
 
 ## Development
 

data/capistrano-itamae.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "capistrano", ">= 3"
   spec.add_dependency "itamae"
 
+  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "serverspec"
 end

data/lib/capistrano/itamae/dsl.rb

@@ -5,24 +5,18 @@ module Capistrano
 
       # Run `itamae ssh`
       # @param recipe_files [String, Array<String>]
-      # @param options [Array] itamae ssh options (default is itamae_ssh_default_options)
-      def itamae_ssh(recipe_files, *options)
-        recipe_files = Array(recipe_files) unless recipe_files.is_a?(Array)
-        recipe_paths = recipe_files.map { |file| itamae_cookbooks_path.join(file) }
-
-        itamae_options =
-          if options.empty?
-            itamae_ssh_default_options
-          else
-            options
-          end
+      # @param options [String] itamae ssh options
+      def itamae_ssh(recipe_files, options = nil)
+        recipe_paths = Array(recipe_files).map { |file| itamae_cookbooks_path.join(file) }
+
+        itamae_options = [options, itamae_ssh_default_options].compact
 
         # NOTE: store server (`host` is changed to localhost in `run_locally`)
         server = host
 
         run_locally do
           Bundler.with_clean_env do
-            execute *generate_itamae_ssh_command(server, recipe_paths, itamae_options)
+            execute(*generate_itamae_ssh_command(server, recipe_paths, itamae_options))
           end
         end
       end

data/lib/capistrano/itamae/variables.rb

@@ -10,7 +10,7 @@ module Capistrano
       end
 
       def itamae_ssh_default_options
-        fetch(:itamae_ssh_default_options, [])
+        fetch(:itamae_ssh_default_options)
       end
     end
   end

data/lib/capistrano/itamae/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Itamae
-    VERSION = "0.1.0.beta2"
+    VERSION = "0.1.0"
   end
 end

data/wercker.yml

@@ -22,14 +22,19 @@ build:
     # http://devcenter.wercker.com/docs/steps/index.html
     steps:
         - script:
-            name: Set variables
+            name: Install Vagrant
+            code: |
+                wget https://releases.hashicorp.com/vagrant/1.8.4/vagrant_1.8.4_x86_64.rpm
+                rpm -i vagrant_1.8.4_x86_64.rpm
+                vagrant plugin install vagrant-digitalocean
+
+        - script:
+            # NOTE: vagrant v1.8.4 depends on bundler v1.12.5
+            # https://github.com/mitchellh/vagrant/blob/v1.8.4/vagrant.gemspec#L23
+            name: Install bundler
             code: |
-                # Quiet vagrant not_in_installer message
-                # ref
-                # * https://github.com/mitchellh/vagrant/blob/v1.8.4/templates/locales/en.yml#L339-L345
-                # * https://github.com/mitchellh/vagrant/blob/v1.8.4/bin/vagrant#L167-L170
-                # * https://github.com/mitchellh/vagrant/blob/v1.8.4/lib/vagrant/shared_helpers.rb#L48-L53
-                export VAGRANT_I_KNOW_WHAT_IM_DOING_PLEASE_BE_QUIET=true
+                 gem uninstall bundler --all --force
+                 gem install bundler -v 1.12.5
 
         - bundle-install:
             jobs: 4
@@ -58,12 +63,12 @@ build:
 
         - script:
             name: start vm
-            code: bundle exec vagrant up default --provider=digital_ocean
+            code: vagrant up default --provider=digital_ocean
             cwd: spec/integration
 
         - script:
             name: vagrant ssh-config
-            code: bundle exec vagrant ssh-config
+            code: vagrant ssh-config
             cwd: spec/integration
 
         - script:
@@ -80,7 +85,7 @@ build:
 
         - script:
             name: shutdown all vms
-            code: bundle exec vagrant destroy -f
+            code: vagrant destroy -f
             cwd: spec/integration
 
         - wantedly/pretty-slack-notify:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-itamae
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta2
+  version: 0.1.0
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -116,9 +131,9 @@ 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: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1