itamae 1.0.0.beta34 → 1.0.0.beta35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35649d044a624b2d15b00968214ab5a9bbdec57d
-  data.tar.gz: 5f221d3341a367ba33934195034f2b146f04d992
+  metadata.gz: 604c4ca5d5f163d3da6cb818dee4c5978ce5c3e8
+  data.tar.gz: a819f6d02d1229fc3cf7c072d080843daaabe348
 SHA512:
-  metadata.gz: a19fe887f749d27ca6f9b9c4eef51a974711f8a79257d2ec6cb8e41e177bd8ed37144a42ba652845a88465d7740a1e8d5641d1e508fcff09a13251152c5282be
-  data.tar.gz: e9fb236ceda5b1901c940053369a75cd37da70e1030a546e2f6a18d92ec49f72eadac7223d9b4221e990657f7f7e200768353a633c63ca9407f2e957db577e29
+  metadata.gz: 6d0c852666278903d4303dab36296cb04247a02aa400f550c842010280ee97fde27d84d0c1b1413e83b16617215728f25fa411a10c8aff2b815611ac3bfcabb7
+  data.tar.gz: 25b9655e55512fce6d744787d2fd23bc4df68dc40fe5aad22523d4e3347a5a6d9e052900a171b3745c9080694c35ed3def32efec0f8d1a5c0ee897b91b368f6e

data/lib/itamae/cli.rb

@@ -33,6 +33,7 @@ module Itamae
     option :key, type: :string, aliases: ['-i']
     option :port, type: :numeric, aliases: ['-p']
     option :ohai, type: :boolean, default: false
+    option :vagrant, type: :boolean, default: false
     def ssh(*recipe_files)
       if recipe_files.empty?
         raise "Please specify recipe files."

data/lib/itamae/logger.rb

@@ -62,13 +62,24 @@ module Itamae
 
     class << self
       def logger
-        @logger ||= ::Logger.new($stdout).tap do |logger|
-          logger.formatter = Formatter.new
-        end
+        @logger ||= create_logger
       end
 
-      def logger=(l)
-        @logger = l
+      def log_device
+        @log_device || $stdout
+      end
+
+      def log_device=(value)
+        @log_device = value
+        @logger = create_logger
+      end
+      
+      private
+
+      def create_logger
+        ::Logger.new(log_device).tap do |logger|
+          logger.formatter = Formatter.new
+        end
       end
 
       def method_missing(method, *args, &block)

data/lib/itamae/resource/file.rb

@@ -12,17 +12,21 @@ module Itamae
       define_attribute :group, type: String
 
       def pre_action
-        src = if content_file
-                content_file
-              else
-                Tempfile.open('itamae') do |f|
+        begin
+          src = if content_file
+                  content_file
+                else
+                  f = Tempfile.open('itamae')
                   f.write(content)
+                  f.close
                   f.path
                 end
-              end
 
-        @temppath = ::File.join(runner.tmpdir, Time.now.to_f.to_s)
-        send_file(src, @temppath)
+          @temppath = ::File.join(runner.tmpdir, Time.now.to_f.to_s)
+          send_file(src, @temppath)
+        ensure
+          f.unlink if f
+        end
 
         case @current_action
         when :create

data/lib/itamae/runner.rb

@@ -49,6 +49,13 @@ module Itamae
           opts[:user] = options[:user] || Etc.getlogin
           opts[:keys] = [options[:key]] if options[:key]
           opts[:port] = options[:port] if options[:port]
+
+          if options[:vagrant]
+            config = Tempfile.new('', Dir.tmpdir)
+            `vagrant ssh-config #{opts[:host]} > #{config.path}`
+            opts.merge!(Net::SSH::Config.for(opts[:host], [config.path]))
+            opts[:host] = opts.delete(:host_name)
+          end
         end
 
         Backend.instance.set_type(type, opts)

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.0.beta34
+1.0.0.beta35

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

@@ -5,7 +5,7 @@ module Itamae
     let(:io) { StringIO.new }
 
     before do
-      Logger.logger = ::Logger.new(io)
+      Logger.log_device = io
     end
 
     [:fatal, :error, :warn, :info, :debug].each do |level|

data/spec/unit/spec_helper.rb

@@ -18,5 +18,5 @@ RSpec.configure do |config|
   config.order = 'random'
 end
 
-Itamae::Logger.logger = ::Logger.new(StringIO.new)
+Itamae::Logger.log_device = StringIO.new
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta34
+  version: 1.0.0.beta35
 platform: ruby
 authors:
 - Ryota Arai