specinfra 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8061d8285c81986ffe33e15367d495f2ca10ed3
-  data.tar.gz: 34380bdcdb9baee88f33439bec9bb60c102c66f4
+  metadata.gz: ed85bd6489ebcc166afd25dc73387e5cdfc40c7d
+  data.tar.gz: b5ce3cbed78d97a0fb100ccee580f13e62041774
 SHA512:
-  metadata.gz: f76d19a2bc4550ae8db2b7e744f1d63f72a9b7645cf60f7a734b022280c37358362503dc94b4396f0faaad8c6b8285ea2d2f894d23cff6dade2b49d3d4dea6de
-  data.tar.gz: 144c166aaca870e04a7166eecdef85d6168a74f2a838ab46485ef3c0bac8d6b22836b2ffbc26b3d36cb0e3131dcd94ee6be9975a3e4c1af28e61d7582342005a
+  metadata.gz: 6d41a358c947bd8a3a38441f3f6b5cdbc2a1e596d0ac737b44e74d0937912a721e1e0104d436b1a809dee6300ce623645999d31f20c6b81f5741b5564c41a36f
+  data.tar.gz: 064f30d4450802ffe0fa555f74451cb98fd79cd98371d53da784f15c5f956a3acda470e2d32cef6aec6db1fe83db26b437cb2a089563c3a764a8edc4500455a9

data/lib/specinfra/backend/shellscript.rb

@@ -5,9 +5,7 @@ module SpecInfra
     class ShellScript < Base
       def initialize
         @lines = [ "#!/bin/sh", "" ]
-        ObjectSpace.define_finalizer(self) {
-          File.write("spec.sh", @lines.join("\n"))
-        }
+        ObjectSpace.define_finalizer(self, Writer.new("spec.sh", @lines))
       end
 
       def run_command(cmd, opts={})
@@ -15,6 +13,17 @@ module SpecInfra
         { :stdout => nil, :stderr => nil,
           :exit_status => 0, :exit_signal => nil }
       end
+
+      class Writer
+        def initialize(file, lines)
+          @file = file
+          @lines = lines
+        end
+
+        def call(*args)
+          File.write(@file, @lines.join("\n"))
+        end
+      end
     end
   end
 end

data/lib/specinfra/command/base.rb

@@ -290,7 +290,7 @@ module SpecInfra
       end
 
       def get_file_content(file)
-        "cat #{file}"
+        "cat #{file} 2> /dev/null || echo -n"
       end
 
       def check_container(container)

data/lib/specinfra/command/debian.rb

@@ -14,6 +14,10 @@ module SpecInfra
         end
         cmd
       end
+
+      def install(package)
+        "apt-get -y install #{package}"
+      end
     end
   end
 end

data/lib/specinfra/command/freebsd.rb

@@ -18,6 +18,10 @@ module SpecInfra
         regexp = "^#{mode}$"
         "stat -f%Lp #{escape(file)} | grep -- #{escape(regexp)}"
       end
+
+      def get_mode(file)
+        "stat -f%Lp #{escape(file)}"
+      end
     end
   end
 end

data/lib/specinfra/helper/backend.rb

@@ -1,13 +1,15 @@
 module SpecInfra
   module Helper
-    ['Exec', 'Ssh', 'Cmd', 'WinRM', 'ShellScript', 'Dockerfile'].each do |backend|
+    ['Exec', 'Ssh', 'Cmd', 'WinRM', 'ShellScript', 'Dockerfile'].each do |type|
       eval <<-EOF
-        module #{backend}
+        module #{type}
           def backend(commands_object=nil)
-            if ! respond_to?(:commands)
+            called_by_detect_os = caller[0] =~ /detect_os\.rb/
+            if ! respond_to?(:commands) || called_by_detect_os
               commands_object = SpecInfra::Command::Base.new
             end
-            instance = SpecInfra::Backend::#{backend}.instance
+
+            instance = SpecInfra::Backend::#{type}.instance
             instance.set_commands(commands_object || commands)
             instance
           end

data/lib/specinfra/helper/detect_os.rb

@@ -8,7 +8,7 @@ module SpecInfra
         if property[:os_by_host][host]
           os = property[:os_by_host][host]
         else
-          os = backend(SpecInfra::Command::Base).check_os
+          os = backend.check_os
           property[:os_by_host][host] = os
         end
         self.class.const_get('SpecInfra').const_get('Command').const_get(os[:family]).new

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler