vos 0.3.12 → 0.3.13

data/lib/old/ssh.rb

@@ -1,11 +1,11 @@
 class Ssh
   attr_reader :config
-  
-  
+
+
   def setstat(path, options)
     remote do |sh, sftp|
       sftp.setstat! path, options
     end
   end
-  
+
 end

data/lib/vos.rb

@@ -13,10 +13,10 @@ require 'open3'
   drivers/ssh
 
   box/shell
-  box/marks  
+  box/marks
   box/vfs
   box
-  
+
   helpers/ubuntu
 ).each{|f| require "vos/#{f}"}
 

data/lib/vos/box.rb

@@ -1,7 +1,7 @@
 module Vos
   class Box
     include Shell, Marks, Vfs
-    
+
     def initialize *args
       first = args.first
       if args.empty?
@@ -10,12 +10,12 @@ module Vos
         if first.is_a? Hash
           options = first
           options[:host] ||= 'localhost'
-        else          
+        else
           options = args[1] || {}
           raise 'invalid arguments' unless options.is_a?(Hash)
           options[:host] = first.to_s
         end
-        
+
         @driver = options[:host] == 'localhost' ? Drivers::Local.new : Drivers::Ssh.new(options)
       elsif args.size == 1
         @driver = first
@@ -25,30 +25,30 @@ module Vos
     end
 
 
-    # 
+    #
     # driver
-    # 
+    #
     attr_reader :driver
-    
+
     def open &block
       driver.open &block
-    end    
+    end
     def close
       driver.close
     end
 
-    
-    # 
+
+    #
     # Miscellaneous
-    # 
+    #
     def inspect; driver.to_s end
     alias_method :to_s, :inspect
-    
+
     def host; driver.host end
-    
+
     def local?; host == 'localhost' end
-    
-    class << self      
+
+    class << self
       def local; @local ||= Box.new end
     end
   end

data/lib/vos/box/marks.rb

@@ -1,7 +1,7 @@
 module Vos
   class Box
     module Marks
-      def mark! key              
+      def mark! key
         marks_dir.file(key).create
         @marks_cache = nil
       end
@@ -10,18 +10,18 @@ module Vos
         marks_cache.include? key.to_s
       end
       alias_method :marked?, :has_mark?
-    
+
       def clear_marks!
         marks_dir.destroy
         @marks_cache = nil
       end
-      
+
       def marks_dir
         dir "/marks"
       end
-      
+
       protected
-        def marks_cache          
+        def marks_cache
           @marks_cache ||= marks_dir.files(bang: false).collect{|file| file.name}
         end
     end

data/lib/vos/box/shell.rb

@@ -1,10 +1,10 @@
 module Vos
   class Box
-    module Shell                
+    module Shell
       def bash cmd, *args
         self['/'].bash cmd, *args
       end
-      
+
       def bash_without_path cmd, *args
         check = args.shift if args.first.is_a?(Regexp)
         options = args.last || {}
@@ -14,7 +14,7 @@ module Vos
 
         unless code == 0
           puts stdout_and_stderr
-          raise "can't execute '#{cmd}'!" 
+          raise "can't execute '#{cmd}'!"
         end
 
         if check and (stdout_and_stderr !~ check)
@@ -24,18 +24,18 @@ module Vos
 
         stdout_and_stderr
       end
-    
+
       def exec cmd
         open{driver.exec(env(cmd))}
       end
-      
+
       attr_writer :env
       def env command_or_env_variables = nil, &block
         @env ||= default_env
-        
-        if block                    
+
+        if block
           before = env.clone
-          begin            
+          begin
             if variables = command_or_env_variables
               raise 'invalid arguments' unless variables.is_a? Hash
               @env.merge! variables
@@ -58,26 +58,26 @@ module Vos
             raise 'invalid arguments'
           end
         end
-      end      
+      end
       def default_env
         {}
       end
       def wrap_cmd env_str, cmd
         %(#{env_str}#{' && ' unless env_str.empty?}#{cmd})
       end
-      
-    
+
+
       def home path = nil
         open{@home = bash('cd ~; pwd').gsub("\n", '')} unless @home
         path ? self[@home][path] : self[@home]
-      end    
-    
+      end
+
       # def generate_tmp_dir_name
       #   open do
       #     driver.generate_tmp_dir_name
       #   end
       # end
-    
+
       # def inspect
       #   "<Box: #{options[:host]}>"
       # end

data/lib/vos/box/vfs.rb

@@ -4,28 +4,28 @@ module Vos
       def open_fs &block
         open &block
       end
-      
+
       def to_entry
         '/'.to_entry_on(self)
       end
-      
+
       def to_file
         to_entry.file
       end
-      
+
       def to_dir
         to_entry.dir
       end
-      
+
       # def [] path
       #   to_entry[path]
       # end
       # alias_method :/, :[]
-            
+
       %w(
-        entry dir file 
+        entry dir file
         entries dirs files
-        [] / 
+        [] /
         tmp
       ).each do |m|
         script = <<-RUBY
@@ -41,7 +41,7 @@ end
 
 module Vfs
   class Dir
-    def bash cmd, *args      
+    def bash cmd, *args
       storage.bash_without_path "cd #{path} && #{cmd}", *args
     end
   end

data/lib/vos/drivers/abstract.rb

@@ -2,7 +2,7 @@ module Vos
   module Drivers
     class Abstract
       attr_reader :options
-    
+
       def initialize options = {}
         @options = options
       end

data/lib/vos/drivers/local.rb

@@ -2,42 +2,42 @@ require 'vfs/storages/local'
 
 module Vos
   module Drivers
-    class Local < Abstract                  
-      # 
+    class Local < Abstract
+      #
       # Vfs
-      # 
+      #
       include Vfs::Storages::Local::LocalVfsHelper
       def open &block
         block.call self if block
       end
       alias_method :open_fs, :open
       def close; end
-      
-      
-      # 
+
+
+      #
       # Shell
-      # 
-      def exec command        
-        code, stdout, stderr = Open3.popen3 command do |stdin, stdout, stderr, waitth|  
+      #
+      def exec command
+        code, stdout, stderr = Open3.popen3 command do |stdin, stdout, stderr, waitth|
           [waitth.value.to_i, stdout.read, stderr.read]
         end
-      
+
         return code, stdout, stderr
       end
-      
-      
+
+
       def bash command
-        code, stdout_and_stderr = Open3.popen2e command do |stdin, stdout_and_stderr, wait_thread|  
+        code, stdout_and_stderr = Open3.popen2e command do |stdin, stdout_and_stderr, wait_thread|
           [wait_thread.value.to_i, stdout_and_stderr.read]
         end
-      
+
         return code, stdout_and_stderr
       end
-      
-      
-      # 
+
+
+      #
       # Other
-      # 
+      #
       def to_s; '' end
       def host; 'localhost' end
     end

data/lib/vos/drivers/specification.rb

@@ -1,15 +1,15 @@
-shared_examples_for 'vos driver' do  
+shared_examples_for 'vos driver' do
   it 'should respond to :host' do
     @driver.host.should_not be_nil
   end
-  
+
   describe "shell" do
     it 'exec' do
       @driver.open do |d|
         d.exec("echo 'ok'").should == [0, "ok\n", ""]
       end
-    end  
-    
+    end
+
     it 'bash' do
       @driver.open do |d|
         d.bash("echo 'ok'").should == [0, "ok\n"]

data/lib/vos/drivers/ssh.rb

@@ -3,31 +3,31 @@ require 'net/sftp'
 
 module Vos
   module Drivers
-    class Ssh < Abstract      
+    class Ssh < Abstract
       DEFAULT_OPTIONS = {
         config: true
       }
-      
+
       def initialize options = {}
-        super        
+        super
         raise ":host not provided!" unless options[:host]
         @options = DEFAULT_OPTIONS.merge options
-        
+
         # config_options = Net::SSH.configuration_for(options[:host])
         # options = DEFAULT_OPTIONS.merge(config_options).merge options
         # raise ":user not provided (provide explicitly or in .ssh/config)!" unless options[:user]
       end
-      
-      
-      # 
+
+
+      #
       # Establishing SSH channel
-      # 
+      #
       def open &block
         if block
           if @ssh
             block.call self
           else
-            begin            
+            begin
               open
               block.call self
             ensure
@@ -44,9 +44,9 @@ module Vos
             @sftp = @ssh.sftp.connect
           end
         end
-      end            
-    
-      def close                        
+      end
+
+      def close
         if @ssh
           @ssh.close
           # @sftp.close not needed
@@ -55,16 +55,16 @@ module Vos
       end
 
 
-      # 
+      #
       # Vfs
-      # 
+      #
       include SshVfsStorage
       alias_method :open_fs, :open
-      
-      
-      # 
+
+
+      #
       # Shell
-      # 
+      #
       def exec command
         # somehow net-ssh doesn't executes ~/.profile, so we need to execute it manually
         # command = ". ~/.profile && #{command}"
@@ -72,8 +72,8 @@ module Vos
         stdout, stderr, code, signal = hacked_exec! ssh, command
 
         return code, stdout, stderr
-      end                              
-      
+      end
+
       def bash command
         # somehow net-ssh doesn't executes ~/.profile, so we need to execute it manually
         # command = ". ~/.profile && #{command}"
@@ -81,55 +81,55 @@ module Vos
 
         return code, stdout_and_stderr
       end
-      
-      
-      # 
+
+
+      #
       # Miscellaneous
-      # 
+      #
       def to_s; options[:host] end
       def host; options[:host] end
-      
+
       protected
         attr_accessor :ssh, :sftp
-      
+
         def fix_path path
           path.sub(/^\~/, home)
         end
-        
+
         def home
           unless @home
             command = 'cd ~; pwd'
             code, stdout, stderr = exec command
             raise "can't execute '#{command}'!" unless code == 0
-            @home = stdout.gsub("\n", '')    
+            @home = stdout.gsub("\n", '')
           end
           @home
         end
-      
+
         # taken from here http://stackoverflow.com/questions/3386233/how-to-get-exit-status-with-rubys-netssh-library/3386375#3386375
         def hacked_exec!(ssh, command, merge_stdout_and_stderr = false, &block)
           stdout_data = ""
           stderr_data = ""
           exit_code = nil
           exit_signal = nil
-        
+
           channel = ssh.open_channel do |channel|
             channel.exec(command) do |ch, success|
               raise "could not execute command: #{command.inspect}" unless success
 
               channel.on_data{|ch2, data| stdout_data << data}
-              channel.on_extended_data do |ch2, type, data| 
+              channel.on_extended_data do |ch2, type, data|
                 stdout_data << data if merge_stdout_and_stderr
                 stderr_data << data
               end
               channel.on_request("exit-status"){|ch,data| exit_code = data.read_long}
               channel.on_request("exit-signal"){|ch, data| exit_signal = data.read_long}
-            end          
-          end  
-        
-          channel.wait      
+            end
+          end
+
+          channel.wait
           [stdout_data, stderr_data, exit_code, exit_signal]
-        end    
+        end
     end
   end
 end

data/lib/vos/drivers/ssh_vfs_storage.rb

@@ -10,10 +10,10 @@ module Vos
           @out.write data
         end
       end
-      
-      # 
+
+      #
       # Attributes
-      # 
+      #
       def attributes path
 
         stat = sftp.stat! fix_path(path)
@@ -21,22 +21,22 @@ module Vos
         attrs[:file] = stat.file?
         attrs[:dir] = stat.directory?
         # stat.symlink?
-      
+
         # attributes special for file system
         attrs[:updated_at] = stat.mtime
-      
-        attrs                  
+
+        attrs
       rescue Net::SFTP::StatusException
         {}
       end
 
-      def set_attributes path, attrs      
+      def set_attributes path, attrs
         raise 'not supported'
       end
 
-      # 
+      #
       # File
-      # 
+      #
       def read_file path, &block
         sftp.file.open fix_path(path), 'r' do |is|
           while buff = is.gets
@@ -45,15 +45,15 @@ module Vos
         end
       end
 
-      def write_file path, append, &block  
-        # there's no support for :append in Net::SFTP, so we just mimic it      
-        if append          
+      def write_file path, append, &block
+        # there's no support for :append in Net::SFTP, so we just mimic it
+        if append
           attrs = attributes(path)
           data = if attrs
             if attrs[:file]
               os = ""
               read_file(path){|buff| os << buff}
-              delete_file path                
+              delete_file path
               os
             else
               raise "can't append to dir!"
@@ -69,8 +69,8 @@ module Vos
           sftp.file.open fix_path(path), 'w' do |out|
             block.call Writer.new(out)
           end
-        end          
-      end   
+        end
+      end
 
       def delete_file remote_file_path
         sftp.remove! fix_path(remote_file_path)
@@ -81,9 +81,9 @@ module Vos
       # end
 
 
-      # 
+      #
       # Dir
-      # 
+      #
       def create_dir path
         sftp.mkdir! path
       end
@@ -94,7 +94,7 @@ module Vos
 
       def each_entry path, query, &block
         raise "SshVfsStorage not support :each_entry with query!" if query
-      
+
         sftp.dir.foreach path do |stat|
           next if stat.name == '.' or stat.name == '..'
           if stat.directory?
@@ -104,13 +104,13 @@ module Vos
           end
         end
       end
-    
+
       # def efficient_dir_copy from, to, override
       #   return false if override # sftp doesn't support this behaviour
-      #   
-      #   from.storage.open_fs do |from_fs|          
+      #
+      #   from.storage.open_fs do |from_fs|
       #     to.storage.open_fs do |to_fs|
-      #       if from_fs.local? 
+      #       if from_fs.local?
       #         sftp.upload! from.path, fix_path(to.path)
       #         true
       #       elsif to_fs.local?
@@ -123,11 +123,11 @@ module Vos
       #   end
       # end
 
-      # 
+      #
       # Special
-      # 
+      #
       def tmp &block
-        tmp_dir = "/tmp/vfs_#{rand(10**3)}"        
+        tmp_dir = "/tmp/vfs_#{rand(10**3)}"
         if block
           begin
             create_dir tmp_dir
@@ -140,7 +140,7 @@ module Vos
           tmp_dir
         end
       end
-    
+
       def local?; false end
     end
   end

data/lib/vos/helpers/ubuntu.rb

@@ -7,25 +7,25 @@ module Vos
       def wrap_cmd env_str, cmd
         %(source #{env_file.path} && #{env_str}#{' && ' unless env_str.empty?}#{cmd})
       end
-      
+
       def env_file
         file '/etc/profile' ## file '/etc/environment'
       end
-      
+
       # def append_to_environment file, reload = true
-      #   raise "#{file} must be an Entry" unless file.is_a? Vfs::Entry        
-      #   
+      #   raise "#{file} must be an Entry" unless file.is_a? Vfs::Entry
+      #
       #   env_ext = dir '/etc/profile_ext'
-      #   
+      #
       #   remote_file = env_ext[file.name]
       #   file.copy_to! remote_file
-      # 
+      #
       #   require_clause = "source #{remote_file.path}"
       #   env_file.append "\n#{require_clause}\n" unless env_file.content.include? require_clause
-      #   
+      #
       #   reload_env if reload
       # end
-      
+
       def reload_env
         bash ". #{env_file.path}"
       end
@@ -41,32 +41,32 @@ module Vfs
       raise "symlink target '' not exist!" unless entry.exist?
       storage.bash "ln -s#{'f' if options[:override]} #{entry.path} #{path}"
     end
-    
+
     def symlink_to! entry
       symlink_to entry, override: true
     end
   end
-  
+
   class Dir
     def rsync_to entry
-      raise "invalid argument!" unless entry.is_a? Entry      
+      raise "invalid argument!" unless entry.is_a? Entry
       raise "#{path} must be a Dir" unless dir?
       raise "#{entry.path} can't be a File!" if entry.file?
-      
+
       if local? and !entry.local?
         Box.local.bash("rsync -e 'ssh' -al --delete --stats --progress #{path}/ root@#{entry.storage.host}:#{entry.path}")
-      elsif entry.local? and !local?        
+      elsif entry.local? and !local?
         Box.local.bash("rsync -e 'ssh' -al --delete --stats --progress root@#{storage.host}:#{path}/ #{entry.path}")
       else
         raise "invalid usage!"
       end
     end
   end
-  
+
   class File
     def append_to_environment_of box, reload = true
-      raise "#{box} must be an Vos::Box" unless box.is_a? Vos::Box        
-      
+      raise "#{box} must be an Vos::Box" unless box.is_a? Vos::Box
+
       remote_file = box.dir('/etc/profile_ext').file(name)
       copy_to! remote_file
 
@@ -75,9 +75,9 @@ module Vfs
 # #{name}
 source #{remote_file.path}
       BASH
-            
+
       box.env_file.append require_clause unless box.env_file.content.include? require_clause
-      
+
       box.reload_env if reload
     end
   end

data/lib/vos/support.rb

@@ -13,25 +13,25 @@ end
 
 # class File
 #   class << self
-#     def ensure_dir_exist directory, options = {}       
-#       options = options.symbolize_keys 
+#     def ensure_dir_exist directory, options = {}
+#       options = options.symbolize_keys
 #       clean = options.delete :clean
 #       raise "unsupported options #{options.keys}!" unless options.empty?
-#     
+#
 #       FileUtils.rm_r directory, force: true if clean and File.exist?(directory)
 #       FileUtils.mkdir_p directory
 #     end
-#   
+#
 #     def copy_dir_content from, to
 #       Dir.glob "#{from}/*" do |item|
 #         FileUtils.cp_r item, to
 #       end
 #     end
-#     
+#
 #     def copy_dir from, to
 #       FileUtils.cp_r from, to
 #     end
-#     
+#
 #     def delete_dir dir
 #       FileUtils.rm_r dir
 #     end

data/readme.md

@@ -1,6 +1,6 @@
 # Vos - Virtual Operating System
 
-Small abstraction over Operating System, mainly it should be used in conjunction with [Virtual File System][vfs] tool. Kind of 
+Small abstraction over Operating System, mainly it should be used in conjunction with [Virtual File System][vfs] tool. Kind of
 Capistrano but without extra stuff and more universal, not forcing You to follow 'The Rails Way'.
 
 Currently, there are following implementations available:
@@ -26,10 +26,14 @@ server.bash 'ls'                                  # ls /
 server['apps/cool_app'].bash 'rails production'   # cd /apps/cool_app && rails production
 ```
 
-For more details look also to [Virtual File System][vfs] project. 
-Or checkout configuration I use to control my production servers [My Cluster][my_cluster] in conjunction with small 
+For more details look also to [Virtual File System][vfs] project.
+Or checkout configuration I use to control my production servers [My Cluster][my_cluster] in conjunction with small
 configuration tool [Cluster Management][cluster_management].
-  
+
+## Please let me know about bugs and Your proposals, there's the 'Issues' tab at the top, feel free to submit.
+
+Copyright (c) Alexey Petrushin http://petrush.in, released under the MIT license.
+
 [vfs]: http://github.com/alexeypetrushin/vfs
 [cluster_management]: http://github.com/alexeypetrushin/cluster_management
 [my_cluster]: http://github.com/alexeypetrushin/my_cluster

data/spec/box_spec.rb

@@ -1,55 +1,55 @@
 require 'spec_helper'
 
-describe Vos::Box do  
+describe Vos::Box do
   before do
     @box = Vos::Box.new
     @box.stub :puts
   end
-  
+
   describe 'vfs integration' do
     it 'smoke test' do
-      @box['/'].exist?.should be_true      
+      @box['/'].exist?.should be_true
     end
-    
+
     it 'vfs integration' do
       @box['/'].bash("echo 'ok'").should == "ok\n"
     end
   end
-  
+
   describe "shell" do
     it 'bash' do
       @box.bash("echo 'ok'").should == "ok\n"
     end
-    
+
     it 'bash working dir should be /' do
       @box.bash('pwd').should == "/\n"
     end
-    
+
     it 'check with regex' do
       @box.bash "echo 'ok'", /ok/
       -> {@box.bash "echo 'ok'", /no/}.should raise_error(/not match/)
     end
-    
+
     it "exec" do
       @box.exec("echo 'ok'").should == [0, "ok\n", ""]
     end
-    
+
     it 'home' do
       @box.home.should_not be_nil
     end
-    
+
     it 'env' do
       @box.env.should == {}
       @box.env = {a: 'b'}
-      
+
       @box.env c: 'd' do
         @box.env.should == {a: 'b', c: 'd'}
       end
       @box.env.should == {a: 'b'}
-      
+
       @box.env(c: 'd')
       @box.env.should == {a: 'b', c: 'd'}
-      
+
       @box.env('ls').should == "a=b c=d && ls"
     end
   end

data/spec/config.example.yml

@@ -1,6 +1,6 @@
 :ssh:
   :host: some_host.com
-  
+
   # optional, you can omit and use id_rsa key instead
   # :user: some_user
   # :password: some_password

data/spec/drivers/local_spec.rb

@@ -2,8 +2,8 @@ require 'drivers/spec_helper'
 
 describe Vos::Drivers::Local do
   it_should_behave_like "vos driver"
-  it_should_behave_like "vfs storage"  
-  
+  it_should_behave_like "vfs storage"
+
   before do
     @storage = @driver = Vos::Drivers::Local.new
   end

data/spec/drivers/ssh_spec.rb

@@ -1,15 +1,15 @@
 require 'drivers/spec_helper'
 
 describe Vos::Drivers::Ssh do
-  it_should_behave_like "vos driver"    
+  it_should_behave_like "vos driver"
   it_should_behave_like "vfs storage"
 
   before :all do
     @storage = @driver = Vos::Drivers::Ssh.new(config[:ssh_driver])
     @driver.open
   end
-  
+
   after :all do
     @driver.close
-  end  
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vos
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &376740 !ruby/object:Gem::Requirement
+  requirement: &363240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *376740
+  version_requirements: *363240
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &667020 !ruby/object:Gem::Requirement
+  requirement: &640270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *667020
+  version_requirements: *640270
 - !ruby/object:Gem::Dependency
   name: vfs
-  requirement: &747540 !ruby/object:Gem::Requirement
+  requirement: &738060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *747540
+  version_requirements: *738060
 description: 
 email: 
 executables: []