itamae 1.2.14 → 1.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e2b12deeb334b692503acf71eb8055c762321c8
-  data.tar.gz: 59299025a68e4dded3bf4f5b35964cf8283e7aa8
+  metadata.gz: 2ca0bac3e644c84e79f48f7a79d593cb5abdaf19
+  data.tar.gz: 30ddcc2257758291ffe1202e9c4bdb70dafce38a
 SHA512:
-  metadata.gz: e32608366152de7f363b6659e15091388ae4db4eec2503269bd01c8cadddffe499a1e4adc82dd9f8f7d2371739d509c0aea152d48eed74ffc778c006171cf00c
-  data.tar.gz: 509f6de4c65776642c32b77abb361c0ecb865babcc82e2825f46b424f6f1cc6edd58b936bd224828cc0e8b9dd4ad4c356ea378522e53296df847a9434a1b35f3
+  metadata.gz: ef86975d368cab1285c77e7ea78aba0f14bf50aba625405db6f6929df30a7150e0b18c340a8041d3f8f97c2cbfec2dbe6ed2d4ba4e56a0511dbb5c89f3f3a930
+  data.tar.gz: 7bf26d88e69315df198c28cef5ea9c1443d374dc86fb27ec0c1a8129dfb283b3a788193f54fe19a25d7fea1f5f1da3ccea4ed7347a2e998126976cc58c0e7c9e

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.2.15
+
+Bugfixes
+
+- [Fix --no-sudo to work properly (by @evalphobia)](https://github.com/itamae-kitchen/itamae/pull/126)
+- [Fix a glitch on raising exception when source doesn't exist (by @mozamimy)](https://github.com/itamae-kitchen/itamae/pull/125)
+
 ## v1.2.14
 
 Features

data/itamae.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "serverspec", "~> 2.1"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "docker-api", "~> 1.20"
+  spec.add_development_dependency "fakefs"
 end

data/lib/itamae/backend.rb

@@ -26,6 +26,7 @@ module Itamae
   module Backend
     UnknownBackendTypeError = Class.new(StandardError)
     CommandExecutionError = Class.new(StandardError)
+    SourceNotExistError = Class.new(StandardError)
 
     class << self
       def create(type, opts = {})
@@ -119,18 +120,21 @@ module Itamae
       def send_file(src, dst)
         Logger.debug "Sending a file from '#{src}' to '#{dst}'..."
         unless ::File.exist?(src)
-          raise Error, "The file '#{src}' doesn't exist."
+          raise SourceNotExistError, "The file '#{src}' doesn't exist."
+        end
+        unless ::File.file?(src)
+          raise SourceNotExistError, "'#{src}' is not a file."
         end
         @backend.send_file(src, dst)
       end
 
       def send_directory(src, dst)
         Logger.debug "Sending a directory from '#{src}' to '#{dst}'..."
-        unless ::File.directory?(src)
-          raise Error, "'#{src}' is not directory."
-        end
         unless ::File.exist?(src)
-          raise Error, "The directory '#{src}' doesn't exist."
+          raise SourceNotExistError, "The directory '#{src}' doesn't exist."
+        end
+        unless ::File.directory?(src)
+          raise SourceNotExistError, "'#{src}' is not a directory."
         end
         @backend.send_directory(src, dst)
       end
@@ -164,7 +168,7 @@ module Itamae
         Specinfra::Backend::Ssh.new(
           request_pty: true,
           host: ssh_options[:host_name],
-          disable_sudo: ssh_options[:disable_sudo],
+          disable_sudo: disable_sudo?,
           ssh_options: ssh_options,
         )
       end
@@ -179,7 +183,6 @@ module Itamae
         opts[:user] = @options[:user] || opts[:user] || Etc.getlogin
         opts[:keys] = [@options[:key]] if @options[:key]
         opts[:port] = @options[:port] if @options[:port]
-        opts[:disable_sudo] = true unless @options[:sudo]
 
         if @options[:vagrant]
           config = Tempfile.new('', Dir.tmpdir)
@@ -197,6 +200,10 @@ module Itamae
 
         opts
       end
+
+      def disable_sudo?
+        !@options[:sudo]
+      end
     end
 
     class Docker < Base

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.2.14
+1.2.15

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

@@ -0,0 +1,94 @@
+require 'spec_helper'
+require 'fakefs/spec_helpers'
+
+module Itamae
+  module Backend
+    describe Base do
+      include FakeFS::SpecHelpers
+
+      class Klass < Itamae::Backend::Base
+        def initialize(_)
+          @backend = Object.new
+          @backend.stub(:send_file)
+          @backend.stub(:send_directory)
+        end
+      end
+
+      describe ".send_file" do
+        context "the source file doesn't exist" do
+          subject { -> { Klass.new("dummy").send_file("src", "dst") } }
+          it { expect(subject).to raise_error(Itamae::Backend::SourceNotExistError, "The file 'src' doesn't exist.") }
+        end
+
+        context "the source file exist, but it is not a regular file" do
+          before { Dir.mkdir("src")  }
+          subject { -> { Klass.new("dummy").send_file("src", "dst") } }
+          it { expect(subject).to raise_error(Itamae::Backend::SourceNotExistError, "'src' is not a file.") }
+        end
+
+        context "the source file is a regular file" do
+          before { FileUtils.touch("src")  }
+          subject { -> { Klass.new("dummy").send_file("src", "dst") } }
+          it { expect { subject }.not_to raise_error }
+        end
+      end
+
+      describe ".send_directory" do
+        context "the source directory doesn't exist" do
+          subject { -> { Klass.new("dummy").send_directory("src", "dst") } }
+          it { expect(subject).to raise_error(Itamae::Backend::SourceNotExistError, "The directory 'src' doesn't exist.") }
+        end
+
+        context "the source directory exist, but it is not a directory" do
+          before { FileUtils.touch("src")  }
+          subject { -> { Klass.new("dummy").send_directory("src", "dst") } }
+          it { expect(subject).to raise_error(Itamae::Backend::SourceNotExistError, "'src' is not a directory.") }
+        end
+
+        context "the source directory is a directory" do
+          before { Dir.mkdir("src")  }
+          subject { -> { Klass.new("dummy").send_directory("src", "dst") } }
+          it { expect { subject }.not_to raise_error }
+        end
+      end
+    end
+
+    describe Ssh do
+
+      describe "#ssh_options" do
+        subject { ssh.send(:ssh_options) }
+
+        let!(:ssh) { described_class.new(options) }
+        let!(:host_name) { "example.com" }
+        let!(:default_option) do
+          opts = {}
+          opts[:host_name] = nil
+          opts.merge!(Net::SSH::Config.for(host_name))
+          opts[:user] = opts[:user] || Etc.getlogin
+          opts
+        end
+
+        context "with host option" do
+          let(:options) { {host: host_name} }
+          it { is_expected.to eq( default_option.merge({host_name: host_name}) ) }
+        end
+      end
+
+      describe "#disable_sudo?" do
+        subject { ssh.send(:disable_sudo?) }
+
+        let!(:ssh) { described_class.new(options)}
+
+        context "when sudo option is true" do
+          let(:options) { {sudo: true} }
+          it { is_expected.to eq(false) }
+        end
+
+        context "when sudo option is false" do
+          let(:options) { {sudo: false} }
+          it { is_expected.to eq(true) }
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.2.14
+  version: 1.2.15
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -170,6 +170,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.20'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  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'
 description: 
 email:
 - ryota.arai@gmail.com
@@ -233,6 +247,7 @@ files:
 - spec/integration/recipes/redefine.rb
 - spec/integration/recipes/templates/template_auto.erb
 - spec/integration/spec_helper.rb
+- spec/unit/lib/itamae/backend_spec.rb
 - spec/unit/lib/itamae/config_spec.rb
 - spec/unit/lib/itamae/logger_spec.rb
 - spec/unit/lib/itamae/node_spec.rb
@@ -281,6 +296,7 @@ test_files:
 - spec/integration/recipes/redefine.rb
 - spec/integration/recipes/templates/template_auto.erb
 - spec/integration/spec_helper.rb
+- spec/unit/lib/itamae/backend_spec.rb
 - spec/unit/lib/itamae/config_spec.rb
 - spec/unit/lib/itamae/logger_spec.rb
 - spec/unit/lib/itamae/node_spec.rb