capistrano-itamae 0.1.0.beta1 → 0.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf6fbab9e49b9fb90b2c2c0eb5a2521c6e19a0da
-  data.tar.gz: a51af34ca69deba9931b3e6be6b0f7953d46394f
+  metadata.gz: 4135186881d5a879ab199b38961b1295c813f871
+  data.tar.gz: 895980b2cbc53f5e1b17897bee7521336780fbef
 SHA512:
-  metadata.gz: f3db99953ddc9df4283a2fd872b785af67230cdba567275c87b79d1db62c59d1be60bf99781c0b375ddb29bf11c4b506a27679fd24cc46a407ba00922bc92765
-  data.tar.gz: f7c58eaff036239f6a2bb595af54401c16cbf4081cc4be1e96eb60f2946aad59cd684653f4d16732d8d96579807f022dadfdaa3570aba350a8a5de16da748ed1
+  metadata.gz: 6f020cea4f4535a124f5125fa846e8f2cdc04a6b3073451899aa1eaec9b0df5d767f02828c1b9a32142c1bb387fe96915ca6ac5e2287c215bdb2a978be9b4143
+  data.tar.gz: 5a1826650db3b06aea15b3ced1850799c0e4c6133099a5e8e8e283dc9f0073db8b84f600b879b19dab93d0bd8f47cf9ad3cffc6e1ac0e2484aac3349ec2eac7c

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+spec/integration/.vagrant/
+spec/integration/log/

data/Gemfile

@@ -2,3 +2,11 @@ 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

@@ -1,6 +1,10 @@
 # Capistrano::Itamae
 
-Run itamae in capistrano task
+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)
+
+[![wercker status](https://app.wercker.com/status/a2f734cda581d3d221e10b1ede83bb71/m/master "wercker status")](https://app.wercker.com/project/bykey/a2f734cda581d3d221e10b1ede83bb71)
 
 ## Installation
 
@@ -31,18 +35,33 @@ require "capistrano/itamae"
 config/deploy.rb
 
 ```ruby
+set :itamae_cookbooks_path, "cookbooks"
+
+set :itamae_ssh_default_options, ["--node-yaml=node.yml"]
+
 desc "Run itamae"
   task :itamae do
     on roles(:all) do
-      itamae_ssh "/path/to/recipe.rb"
+      # Run itamae ssh --node-yaml=node.yml cookbooks/recipe.rb
+      itamae_ssh "recipe.rb"
+
+      # Run itamae ssh --node-yaml=node.yml cookbooks/recipe1.rb cookbooks/recipe2.rb
+      itamae_ssh ["recipe1.rb", "recipe2.rb"]
+
+      # Run itamae ssh --node-yaml=node.yml cookbooks/recipe.rb --dry-run
+      itamae_ssh "recipe.rb", "--dry-run"
     end
   end
 end
 ```
 
+see [Capistrano::Itamae::DSL#itamae_ssh](lib/capistrano/itamae/dsl.rb)
+
 ## Variables
-* `itamae_path` : path to itamae executable file (default: `bundle exec itamae`)
-* `itamae_default_options` : (default: `[]`)
+* `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
 
 ## Development
 
@@ -50,6 +69,13 @@ After checking out the repo, run `bin/setup` to install dependencies. You can al
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+## Integration test
+```sh
+cd spec/integration
+bundle exec vagrant up
+bundle exec rake spec
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/sue445/capistrano-itamae.

data/Rakefile

@@ -1,2 +1 @@
 require "bundler/gem_tasks"
-task :default => :spec

data/capistrano-itamae.gemspec

@@ -19,9 +19,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "bundler"
   spec.add_dependency "capistrano", ">= 3"
   spec.add_dependency "itamae"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "serverspec"
 end

data/lib/capistrano/itamae/dsl.rb

@@ -1,45 +1,54 @@
 module Capistrano
   module Itamae
     module DSL
-      def itamae_ssh(recipes, *options)
-        recipes = Array(recipes) unless recipes.is_a?(Array)
-
-        itamae_options = itamae_default_options if options.empty?
+      require "bundler"
+
+      # 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
 
-        command = []
-        command << itamae_path
-        command << "ssh"
-        command += recipes
-        command += itamae_options unless itamae_options.empty?
-        command += ssh_options
+        # NOTE: store server (`host` is changed to localhost in `run_locally`)
+        server = host
 
         run_locally do
           Bundler.with_clean_env do
-            execute command.join(" ")
+            execute *generate_itamae_ssh_command(server, recipe_paths, itamae_options)
           end
         end
       end
 
       private
 
-      def itamae_path
-        fetch(:itamae_path, "bundle exec itamae")
-      end
+      def generate_itamae_ssh_command(server, recipe_paths, itamae_options)
+        command = [:bundle, :exec, itamae_bin_name, :ssh]
+
+        command += recipe_paths
+        command += itamae_options unless itamae_options.empty?
+        command += ssh_options(server)
 
-      def itamae_default_options
-        fetch(:itamae_default_options, [])
+        command
       end
 
-      def ssh_options
+      def ssh_options(server)
         ssh_options = fetch(:ssh_options, {}).dup
-        ssh_options.merge!(host.ssh_options) if host.ssh_options
-        ssh_options[:user] ||= host.user
-        ssh_options[:port] ||= host.port
-        ssh_options[:keys] ||= host.keys
+        ssh_options.merge!(server.ssh_options) if server.ssh_options
+        ssh_options[:user] ||= server.user
+        ssh_options[:port] ||= server.port
+        ssh_options[:keys] ||= server.keys
         ssh_options[:key]  ||= ssh_options[:keys].first if ssh_options[:keys] && !ssh_options[:keys].empty?
 
         options = []
-        options << "--host #{host.hostname}"
+        options << "--host #{server.hostname}"
         options << "--user #{ssh_options[:user]}" if ssh_options[:user]
         options << "--port #{ssh_options[:port]}" if ssh_options[:port]
         options << "--key #{ssh_options[:key]}" if ssh_options[:key]

data/lib/capistrano/itamae/variables.rb

@@ -0,0 +1,19 @@
+module Capistrano
+  module Itamae
+    module Variables
+      def itamae_cookbooks_path
+        Pathname.new(fetch(:itamae_cookbooks_path, "cookbooks"))
+      end
+
+      def itamae_bin_name
+        fetch(:itamae_bin_name, "itamae")
+      end
+
+      def itamae_ssh_default_options
+        fetch(:itamae_ssh_default_options, [])
+      end
+    end
+  end
+end
+
+include Capistrano::Itamae::Variables

data/lib/capistrano/itamae/version.rb

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

data/lib/capistrano/itamae.rb

@@ -1,6 +1,7 @@
 require "capistrano/itamae/version"
 require "capistrano"
 require "capistrano/itamae/dsl"
+require "capistrano/itamae/variables"
 
 module Capistrano
   module Itamae

data/wercker.yml

@@ -0,0 +1,88 @@
+# This references the default Ruby container from
+# the Docker Hub.
+# https://registry.hub.docker.com/_/ruby/
+# If you want to use a specific version you would use a tag:
+# ruby:2.2.2
+box: drecom/centos-ruby:2.3.1
+# You can also use services such as databases. Read more on our dev center:
+# http://devcenter.wercker.com/docs/services/index.html
+# services:
+    # - postgres
+    # http://devcenter.wercker.com/docs/services/postgresql.html
+
+    # - mongo
+    # http://devcenter.wercker.com/docs/services/mongodb.html
+
+# This is the build pipeline. Pipelines are the core of wercker
+# Read more about pipelines on our dev center
+# http://devcenter.wercker.com/docs/pipelines/index.html
+build:
+    # Steps make up the actions in your pipeline
+    # Read more about steps on our dev center:
+    # http://devcenter.wercker.com/docs/steps/index.html
+    steps:
+        - script:
+            name: Set variables
+            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
+
+        - bundle-install:
+            jobs: 4
+
+        - script:
+            name: create .ssh directory
+            code: mkdir -m 700 -p $HOME/.ssh
+
+        - create-file:
+            name: put private key
+            filename: $HOME/.ssh/id_rsa.vagrant
+            overwrite: true
+            hide-from-log: true
+            content: $DIGITALOCEAN_KEY_PRIVATE
+
+        - create-file:
+            name: put public key
+            filename: $HOME/.ssh/id_rsa.vagrant.pub
+            overwrite: true
+            hide-from-log: true
+            content: $DIGITALOCEAN_KEY_PUBLIC
+
+        - script:
+            name: chmod 600 id_rsa
+            code: chmod 600 $HOME/.ssh/id_rsa.vagrant
+
+        - script:
+            name: start vm
+            code: bundle exec vagrant up default --provider=digital_ocean
+            cwd: spec/integration
+
+        - script:
+            name: vagrant ssh-config
+            code: bundle exec vagrant ssh-config
+            cwd: spec/integration
+
+        - script:
+            name: run integration test
+            code: bundle exec rake spec
+            cwd: spec/integration
+
+    after-steps:
+        - script:
+            name: Set variables
+            code: |
+                # NOTE: override .ruby-version in pretty-slack-notify
+                export RBENV_VERSION=2.3.1
+
+        - script:
+            name: shutdown all vms
+            code: bundle exec vagrant destroy -f
+            cwd: spec/integration
+
+        - wantedly/pretty-slack-notify:
+            webhook_url: $SLACK_WEBHOOK_URL
+            username: wercker_build

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-itamae
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta1
+  version: 0.1.0.beta2
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
@@ -39,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: serverspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: Run itamae in capistrano task
 email:
 - sue445@sue445.net
@@ -84,7 +98,9 @@ files:
 - lib/capistrano-itamae.rb
 - lib/capistrano/itamae.rb
 - lib/capistrano/itamae/dsl.rb
+- lib/capistrano/itamae/variables.rb
 - lib/capistrano/itamae/version.rb
+- wercker.yml
 homepage: https://github.com/sue445/capistrano-itamae
 licenses:
 - MIT