itamae 1.9.8 → 1.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 328f99ca3c77bdfb7dd735eaa16c740f42dbf8d8
-  data.tar.gz: b5c102ee7950c954c7b56bc146ebdfdf89512f16
+  metadata.gz: 83dedd045d05da0413cae3765fdb4a0c97f44121
+  data.tar.gz: d45bcc5ae690ed0044ccfddc06eadbbc6bfe9690
 SHA512:
-  metadata.gz: 81b4df62bf844dba2fba5b76b9126650cdc81666583c112bf6fb0fb14aeeb9dc054b0d920ae7289c2cb4e983219110e42448b4b5fa6a877a0cd904e27df18ff2
-  data.tar.gz: d9391e3125d6d7257f1819aa7a4afbab53d07573a3d786f894fcb8bbedf01be3a8dc00a7fb37d1276400c9bc3023463976b2d0beda8b09439e0e05ac3dd0228b
+  metadata.gz: 872059daf89a6e4a7ae772278b618055cbe03325e67d45bf4dc0e4cfd3e4ccac9ade93f6a20e9789d7bfb997b577c9ec05d819b96197084bb8a55bd61dc99d35
+  data.tar.gz: 4e27434ae02d17fb5613dd1693462e8f714ecd759aeef3430f24561de9244629fc5b72af3e79ec3f326544aa1bc38ef5eba591d3c8fc67516bbcc818e833b7e7

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v1.9.9
+
+Features
+
+- [`itamae ssh` now accepts `--ssh-config` option](https://github.com/itamae-kitchen/itamae/pull/211)
+- [Introduce `--login-shell` option](https://github.com/itamae-kitchen/itamae/pull/217)
+- [`gem_package` resource has `uninstall` action](https://github.com/itamae-kitchen/itamae/pull/216)
+
+Bugfixes
+
+- [`send_file` fails against docker backend](https://github.com/itamae-kitchen/itamae/pull/215)
+
 ## v1.9.8
 
 Bugfixes

data/README.md

@@ -90,7 +90,7 @@ $ bundle exec rake spec
 
 ## Contributing
 
-If you have a problem, please [create an issue](https://github.com/ryotarai/itamae/issues/new) or a pull request.
+If you have a problem, please [create an issue](https://github.com/itamae-kitchen/itamae/issues/new) or a pull request.
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)

data/itamae.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Ryota Arai"]
   spec.email         = ["ryota.arai@gmail.com"]
   spec.summary       = %q{Simple Configuration Management Tool}
-  spec.homepage      = "https://github.com/ryotarai/itamae"
+  spec.homepage      = "https://github.com/itamae-kitchen/itamae"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/lib/itamae/backend.rb

@@ -221,6 +221,7 @@ module Itamae
           disable_sudo: disable_sudo?,
           ssh_options: ssh_options,
           shell: @options[:shell],
+          login_shell: @options[:login_shell],
         )
       end
 
@@ -230,7 +231,8 @@ module Itamae
         opts[:host_name] = @options[:host]
 
         # from ssh-config
-        opts.merge!(Net::SSH::Config.for(@options[:host]))
+        ssh_config_files = @options[:ssh_config] ? [@options[:ssh_config]] : Net::SSH::Config.default_files
+        opts.merge!(Net::SSH::Config.for(@options[:host], ssh_config_files))
         opts[:user] = @options[:user] || opts[:user] || Etc.getlogin
         opts[:keys] = [@options[:key]] if @options[:key]
         opts[:port] = @options[:port] if @options[:port]

data/lib/itamae/cli.rb

@@ -22,6 +22,7 @@ module Itamae
       option :node_yaml, type: :string, aliases: ['-y']
       option :dry_run, type: :boolean, aliases: ['-n']
       option :shell, type: :string, default: "/bin/sh"
+      option :login_shell, type: :boolean, default: false
       option :ohai, type: :boolean, default: false, desc: "This option is DEPRECATED and will be unavailable."
       option :profile, type: :string, desc: "[EXPERIMENTAL] Save profiling data", banner: "PATH"
       option :detailed_exitcode, type: :boolean, default: false, desc: "exit code 0 - The run succeeded with no changes or failures, exit code 1 - The run failed, exit code 2 - The run succeeded, and some resources were changed"
@@ -43,6 +44,7 @@ module Itamae
     option :user, type: :string, aliases: ['-u']
     option :key, type: :string, aliases: ['-i']
     option :port, type: :numeric, aliases: ['-p']
+    option :ssh_config, type: :string
     option :vagrant, type: :boolean, default: false
     option :ask_password, type: :boolean, default: false
     option :sudo, type: :boolean, default: true

data/lib/itamae/resource/file.rb

@@ -174,9 +174,16 @@ module Itamae
 
           @temppath = ::File.join(runner.tmpdir, Time.now.to_f.to_s)
 
-          run_command(["touch", @temppath])
-          run_specinfra(:change_file_mode, @temppath, '0600')
-          backend.send_file(src, @temppath)
+          if backend.is_a?(Itamae::Backend::Docker)
+            run_command(["mkdir", @temppath])
+            backend.send_file(src, @temppath)
+            @temppath = ::File.join(@temppath, ::File.basename(src))
+          else
+            run_command(["touch", @temppath])
+            run_specinfra(:change_file_mode, @temppath, '0600')
+            backend.send_file(src, @temppath)
+          end
+
           run_specinfra(:change_file_mode, @temppath, '0600')
         ensure
           f.unlink if f

data/lib/itamae/resource/gem_package.rb

@@ -14,6 +14,8 @@ module Itamae
         case @current_action
         when :install
           attributes.installed = true
+        when :uninstall
+          attributes.installed = false
         end
       end
 
@@ -43,6 +45,10 @@ module Itamae
         end
       end
 
+      def action_uninstall(action_options)
+        uninstall! if current.installed
+      end
+
       def action_upgrade(action_options)
         return if current.installed && attributes.version && current.version == attributes.version
 
@@ -76,6 +82,18 @@ module Itamae
 
         run_command(cmd)
       end
+
+      def uninstall!
+        cmd = [*Array(attributes.gem_binary), 'uninstall', '--ignore-dependencies', '--executables', *Array(attributes.options)]
+        if attributes.version
+          cmd << '-v' << attributes.version
+        else
+          cmd << '--all'
+        end
+        cmd << attributes.package_name
+
+        run_command(cmd)
+      end
     end
   end
 end

data/lib/itamae/version.rb

@@ -1,3 +1,3 @@
 module Itamae
-  VERSION = "1.9.8"
+  VERSION = "1.9.9"
 end

data/spec/integration/default_spec.rb

@@ -176,6 +176,14 @@ describe command('gem list') do
   its(:stdout) { should include('tzinfo (1.2.2, 1.1.0)') }
 end
 
+describe command('gem list') do
+  its(:stdout) { should include('rake (11.1.0)') }
+end
+
+describe command('gem list') do
+  its(:stdout) { should_not include('test-unit') }
+end
+
 describe command('ri Bundler') do
   its(:stderr) { should eq("Nothing known about Bundler\n") }
 end

data/spec/integration/recipes/default.rb

@@ -69,6 +69,31 @@ gem_package 'bundler' do
   options ['--no-ri', '--no-rdoc']
 end
 
+gem_package 'rake' do
+  version '11.1.0'
+end
+
+gem_package 'rake' do
+  version '11.2.2'
+end
+
+gem_package 'rake' do
+  action :uninstall
+  version '11.2.2'
+end
+
+gem_package 'test-unit' do
+  version '3.2.0'
+end
+
+gem_package 'test-unit' do
+  version '3.1.9'
+end
+
+gem_package 'test-unit' do
+  action :uninstall
+end
+
 ######
 
 execute "echo -n > /tmp/notifies"

data/spec/unit/lib/itamae/backend_spec.rb

@@ -73,6 +73,26 @@ module Itamae
           let(:options) { {host: host_name} }
           it { is_expected.to eq( default_option.merge({host_name: host_name}) ) }
         end
+
+        context "with ssh_config option" do
+          around do |example|
+            Tempfile.create("ssh_config") do |temp|
+              temp.write(<<EOF)
+Host ex1
+  HostName example.com
+  User myname
+  Port 10022
+EOF
+              temp.flush
+              @ssh_config = temp.path
+              example.run
+            end
+          end
+
+          let(:options) { {host: "ex1", ssh_config: @ssh_config} }
+
+          it { is_expected.to a_hash_including({host_name: "example.com", user: "myname", port: 10022}) }
+        end
       end
 
       describe "#disable_sudo?" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.9.8
+  version: 1.9.9
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -293,7 +293,7 @@ files:
 - spec/unit/lib/itamae/runner_spec.rb
 - spec/unit/spec_helper.rb
 - wercker.yml
-homepage: https://github.com/ryotarai/itamae
+homepage: https://github.com/itamae-kitchen/itamae
 licenses:
 - MIT
 metadata: {}