itamae 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 227dbcf60bef27ebe4fe8ac784778ba216db0ef9
-  data.tar.gz: a197449bc2efd001cffc643948adce729bee01ae
+  metadata.gz: 8bab606a429b8dcf5fcaa424ffc3a9a62c778ef0
+  data.tar.gz: 8ee54b6444e9932e3018dbfbd2a0c6cea1781219
 SHA512:
-  metadata.gz: 85e3000f94d22b93dc3f1841c9c2c32f02a7e582f547637fcaff3623c8194e07a02211df19b72a7f7c3c7d0548fa692dfdc00bd92fe8253db749ec86e7f2dc4b
-  data.tar.gz: 34edd65f815cbdb4d5159c9a452c469d1d4b57a035c5db10cae747d9c721e52efc8cc099f4cb337987a25dec86464e6acbf7bea11a2d74acebcde666ac70b605
+  metadata.gz: 54c65502fc518537dd3cb0b3c5efcb38373a7489cef722c05cd52ac4ad8e61b7a9b9c768fa900c519be10dc3b2f6abf626617c4937e96365518c3983c8709fed
+  data.tar.gz: d1b0d44adbd650e2e8f014d979047bffddfc4062efff750910f5cd7b92c0ae15309112cd39a5846889346695353ce5691ef34eb03de2b6679e2b2e2f917f7526

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.4.4
+
+Features
+
+- `--shell` option for `local`, `ssh` and `docker` subcommands. If it is set, it will be used instead of /bin/sh
+
 ## v1.4.3
 
 Bugfixes

data/lib/itamae/backend.rb

@@ -177,18 +177,23 @@ module Itamae
         user = options[:user]
         if user
           command = "cd ~#{user.shellescape} ; #{command}"
-          command = "sudo -H -u #{user.shellescape} -- /bin/sh -c #{command.shellescape}"
+          command = "sudo -H -u #{user.shellescape} -- #{shell.shellescape} -c #{command.shellescape}"
         end
 
         command
       end
+
+      def shell
+        @options[:shell]
+      end
     end
 
-    # TODO: Make Specinfra's backends instanciatable 
     class Local < Base
       private
       def create_specinfra_backend
-        Specinfra::Backend::Exec.new()
+        Specinfra::Backend::Exec.new(
+          shell: @options[:shell],
+        )
       end
     end
 
@@ -200,6 +205,7 @@ module Itamae
           host: ssh_options[:host_name],
           disable_sudo: disable_sudo?,
           ssh_options: ssh_options,
+          shell: @options[:shell],
         )
       end
 
@@ -257,6 +263,7 @@ module Itamae
         Specinfra::Backend::Docker.new(
           docker_image: @options[:image],
           docker_container: @options[:container],
+          shell: @options[:shell],
         )
       end
     end

data/lib/itamae/cli.rb

@@ -14,12 +14,17 @@ module Itamae
       Itamae::Logger.formatter.colored = options[:color]
     end
 
+    def self.define_exec_options
+      option :dot, type: :string, default: nil, desc: "Only write dependency graph in DOT", banner: "PATH"
+      option :node_json, type: :string, aliases: ['-j']
+      option :node_yaml, type: :string, aliases: ['-y']
+      option :dry_run, type: :boolean, aliases: ['-n']
+      option :shell, type: :string, default: "/bin/sh"
+      option :ohai, type: :boolean, default: false, desc: "This option is DEPRECATED and will be inavailable."
+    end
+
     desc "local RECIPE [RECIPE...]", "Run Itamae locally"
-    option :dot, type: :string, default: nil, desc: "Only write dependency graph in DOT", banner: "PATH"
-    option :node_json, type: :string, aliases: ['-j']
-    option :node_yaml, type: :string, aliases: ['-y']
-    option :dry_run, type: :boolean, aliases: ['-n']
-    option :ohai, type: :boolean, default: false, desc: "This option is DEPRECATED and will be inavailable."
+    define_exec_options
     def local(*recipe_files)
       if recipe_files.empty?
         raise "Please specify recipe files."
@@ -29,15 +34,11 @@ module Itamae
     end
 
     desc "ssh RECIPE [RECIPE...]", "Run Itamae via ssh"
-    option :dot, type: :string, default: nil, desc: "Only write dependency graph in DOT", banner: "PATH"
-    option :node_json, type: :string, aliases: ['-j']
-    option :node_yaml, type: :string, aliases: ['-y']
-    option :dry_run, type: :boolean, aliases: ['-n']
+    define_exec_options
     option :host, type: :string, aliases: ['-h']
     option :user, type: :string, aliases: ['-u']
     option :key, type: :string, aliases: ['-i']
     option :port, type: :numeric, aliases: ['-p']
-    option :ohai, type: :boolean, default: false, desc: "This option is DEPRECATED and will be inavailable."
     option :vagrant, type: :boolean, default: false
     option :ask_password, type: :boolean, default: false
     option :sudo, type: :boolean, default: true
@@ -54,11 +55,7 @@ module Itamae
     end
 
     desc "docker RECIPE [RECIPE...]", "Create Docker image"
-    option :dot, type: :string, default: nil, desc: "Only write dependency graph in DOT", banner: "PATH"
-    option :node_json, type: :string, aliases: ['-j']
-    option :node_yaml, type: :string, aliases: ['-y']
-    option :dry_run, type: :boolean, aliases: ['-n']
-    option :ohai, type: :boolean, default: false, desc: "This option is DEPRECATED and will be inavailable."
+    define_exec_options
     option :image, type: :string, desc: "This option or 'container' option is required."
     option :container, type: :string, desc: "This option or 'image' option is required."
     option :tls_verify_peer, type: :boolean, default: true

data/lib/itamae/resource/base.rb

@@ -133,9 +133,7 @@ module Itamae
           end
 
           [specific_action || attributes.action].flatten.each do |action|
-            original_attributes = @attributes
             run_action(action, options)
-            @attributes = original_attributes
           end
 
           verify unless options[:dry_run]
@@ -169,6 +167,7 @@ module Itamae
       alias_method :current, :current_attributes
 
       def run_action(action, options)
+        original_attributes = @attributes # preserve and restore later
         @current_action = action
 
         clear_current_attributes
@@ -200,6 +199,7 @@ module Itamae
         end
 
         @current_action = nil
+        @attributes = original_attributes
       end
 
       def clear_current_attributes

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.4.3
+1.4.4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor