specinfra 2.0.0.beta17 → 2.0.0.beta18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9141ed5f23cd671075173286b85cc67b619889f7
-  data.tar.gz: 28a674a6cc109c73a8fb4a50c47eda6daddac8c0
+  metadata.gz: 6af2a5fa821f3d2f51a4982137e50c24b32cec22
+  data.tar.gz: 630f65f9b762a5d48429a99931f3c612c420843b
 SHA512:
-  metadata.gz: f328422b57af471639714cb4c9f327e296d78f9063d47db3df43687458da33d61446a3207bbea9d65141b6e5c4931e4215791ef74a10f095b325404a9d3315d8
-  data.tar.gz: 797567cf8b7aef533bb050a615a842f7621e60167613ac22497538153961ba667a99f62bd48cfa30777d05b59bec98f71909ae330f9229b3eabe65e476dd5d84
+  metadata.gz: 85b58ab0d41c0327d9fbac11ff03787f82192e21a818bf8a224195c8615982015165a3d296922d9de69382bec2055e905871d83980926a2f7481640a5976dbc8
+  data.tar.gz: 342e63846bff9fb14ce8d2b601352e47f865ff7c2c0340cdf68505edc859c80863aaef63e2efd4f8036e0ad0937c1a864f815accccb7a6abd63d8ce01923558c

data/lib/specinfra.rb

@@ -19,8 +19,11 @@ module Specinfra
     end
 
     def backend
-      type = Specinfra.configuration.backend.to_s.to_camel_case
-      eval "Specinfra::Backend::#{type}.instance"
+      type = Specinfra.configuration.backend
+      if type.nil?
+        raise "No backend type is specified. Please specify backend type by `set :backend, :type'"
+      end
+      eval "Specinfra::Backend::#{type.to_s.to_camel_case}.instance"
     end
   end
 end

data/lib/specinfra/backend/ssh.rb

@@ -1,6 +1,6 @@
 require 'specinfra/backend/exec'
 require 'net/ssh'
-
+require 'net/scp'
 module Specinfra
   module Backend
     class Ssh < Exec
@@ -58,6 +58,10 @@ module Specinfra
       end
 
       def copy_file(from, to)
+        if Specinfra.configuration.scp.nil?
+          Specinfra.configuration.scp = create_scp
+        end
+
         scp = Specinfra.configuration.scp
         begin
           scp.upload!(from, to)
@@ -68,6 +72,22 @@ module Specinfra
       end
 
       private
+      def create_ssh
+        Net::SSH.start(
+          Specinfra.configuration.host,
+          Specinfra.configuration.ssh_options[:user],
+          Specinfra.configuration.ssh_options
+        )
+      end
+
+      def create_scp
+        ssh = Specinfra.configuration.ssh
+        if ssh.nil?
+          ssh = create_ssh
+        end
+        Net::SCP.new(ssh)
+      end
+      
       def ssh_exec!(command)
         stdout_data = ''
         stderr_data = ''
@@ -75,11 +95,7 @@ module Specinfra
         exit_signal = nil
 
         if Specinfra.configuration.ssh.nil?
-          Specinfra.configuration.ssh = Net::SSH.start(
-            Specinfra.configuration.host,
-            Specinfra.configuration.ssh_options[:user],
-            Specinfra.configuration.ssh_options
-          )
+          Specinfra.configuration.ssh = create_ssh
         end
 
         ssh = Specinfra.configuration.ssh

data/lib/specinfra/command/base.rb

@@ -36,7 +36,7 @@ class Specinfra::Command::Base
       family  = os[:family]
       version = os[:release] ? "V#{os[:release].to_i}" : nil
 
-      common_class = self.class.const_get('Specinfra').const_get('Command')
+      common_class = Specinfra::Command
       base_class   = common_class.const_get('Base')
       os_class     = family.nil? ? base_class : common_class.const_get(family.capitalize)
 

data/lib/specinfra/command/base/file.rb

@@ -93,5 +93,18 @@ class Specinfra::Command::Base::File < Specinfra::Command::Base
     def get_size(file)
       "stat -c %s #{escape(file)}"
     end
+
+    def change_mode(file, mode)
+      "chmod #{mode} #{escape(file)}"
+    end
+
+    def change_owner(file, owner, group=nil)
+      owner = "#{owner}:#{group}" if group
+      "chown #{owner} #{escape(file)}"
+    end
+
+    def change_group(file, group)
+      "chgrp #{group} #{escape(file)}"
+    end
   end
 end

data/lib/specinfra/command/opensuse/base/service.rb

@@ -1,5 +1,7 @@
 class Specinfra::Command::Opensuse::Base::Service < Specinfra::Command::Suse::Base::Service
   class << self
-    include Specinfra::Command::Module::Systemd
+    def check_is_running(service)
+      "service #{escape(service)} status"
+    end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta17"
+  VERSION = "2.0.0.beta18"
 end

data/spec/command/base/file_spec.rb

@@ -2,10 +2,28 @@ require 'spec_helper'
 
 set :os, { :family => nil }
 
-describe  Specinfra.command.check_file_is_directory('/tmp') do
+describe 'File related commands'  do
   after do
     property[:os_by_host] = nil
   end
 
-  it { should eq 'test -d /tmp' }
+  context Specinfra.command.check_file_is_directory('/tmp') do
+    it { should eq 'test -d /tmp' }
+  end
+
+  context Specinfra.command.change_file_mode('/tmp', '0644') do
+    it { should eq 'chmod 0644 /tmp' }
+  end
+
+  context Specinfra.command.change_file_owner('/tmp', 'root') do
+    it { should eq 'chown root /tmp' }
+  end
+
+  context Specinfra.command.change_file_owner('/tmp', 'root', 'root') do
+    it { should eq 'chown root:root /tmp' }
+  end
+
+  context Specinfra.command.change_file_group('/tmp', 'root') do
+    it { should eq 'chgrp root /tmp' }
+  end
 end

data/specinfra.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "net-ssh"
+  spec.add_runtime_dependency "net-scp"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta17
+  version: 2.0.0.beta18
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement