vos 0.1.3 → 0.1.4

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake_ext'
 
 project(
   name: "vos",
-  version: "0.1.3",
+  version: "0.1.4",
   summary: "Virtual Operating System",
 
   author: "Alexey Petrushin",

data/lib/vos/box/marks.rb

@@ -1,30 +1,28 @@
 module Vos
   class Box
     module Marks
-      def mark key
-        ensure_mark_requrements!
-        file("#{marks_dir}/#{key}").create!
+      def mark! key              
+        marks_dir.file(key).create
+        @marks_cache = nil
       end
 
       def has_mark? key
-        ensure_mark_requrements!
-        entry["#{marks_dir}/#{key}"].exist?
+        marks_cache.include? key.to_s
       end
+      alias_method :marked?, :has_mark?
     
-      def clear_marks
-        bash "rm -r #{marks_dir}"
+      def clear_marks!
+        marks_dir.destroy
+        @marks_cache = nil
       end
-    
+      
+      def marks_dir
+        dir "/marks"
+      end
+      
       protected
-        def marks_dir
-          home "/.marks"
-        end
-
-        def ensure_mark_requrements!
-          unless @ensure_mark_requrements
-            self.dir(marks_dir).create
-            @ensure_mark_requrements = true
-          end
+        def marks_cache          
+          @marks_cache ||= marks_dir.files(bang: false).collect{|file| file.name}
         end
     end
   end

data/lib/vos/box.rb

@@ -2,8 +2,6 @@ module Vos
   class Box
     include Shell, Marks, Vfs
     
-    attr_accessor :options
-    
     def initialize *args
       first = args.first
       if args.empty?
@@ -18,12 +16,12 @@ module Vos
           options[:host] = first.to_s
         end
         
-        @driver = options[:host] == 'localhost' ? Drivers::Local.new(options) : Drivers::Ssh.new(options)
+        @driver = options[:host] == 'localhost' ? Drivers::Local.new : Drivers::Ssh.new(options)
       elsif args.size == 1
         @driver = first
       else
         raise 'invalid arguments'
-      end      
+      end
     end
 
 
@@ -43,15 +41,15 @@ module Vos
     # 
     # Micelaneous
     # 
-    def inspect
-      driver.to_s
-      # host = options[:host]
-      # if host == 'localhost'
-      #   ''
-      # else
-      #   host
-      # end
-    end
+    def inspect; driver.to_s end
     alias_method :to_s, :inspect
+    
+    def host; driver.host end
+    
+    def local?; host == 'localhost' end
+    
+    class << self      
+      def local; @local ||= Box.new end
+    end
   end
 end

data/lib/vos/drivers/local.rb

@@ -2,7 +2,7 @@ require 'vfs/storages/local'
 
 module Vos
   module Drivers
-    class Local < Abstract
+    class Local < Abstract                  
       # 
       # Vfs
       # 
@@ -39,6 +39,7 @@ module Vos
       # Other
       # 
       def to_s; '' end
+      def host; 'localhost' end
     end
   end
 end

data/lib/vos/drivers/specification.rb

@@ -1,4 +1,8 @@
 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|

data/lib/vos/drivers/ssh.rb

@@ -77,7 +77,6 @@ module Vos
       def bash command
         # somehow net-ssh doesn't executes ~/.profile, so we need to execute it manually
         # command = ". ~/.profile && #{command}"
-
         stdout_and_stderr, stderr, code, signal = hacked_exec! ssh, command, true
 
         return code, stdout_and_stderr
@@ -88,6 +87,7 @@ module Vos
       # Micelaneous
       # 
       def to_s; options[:host] end
+      def host; options[:host] end
       
       protected
         attr_accessor :ssh, :sftp
@@ -128,7 +128,6 @@ module Vos
           end  
         
           channel.wait      
-        
           [stdout_data, stderr_data, exit_code, exit_signal]
         end    
     end

data/lib/vos/drivers/ssh_vfs_storage.rb

@@ -11,6 +11,10 @@ module Vos
         attrs[:file] = stat.file?
         attrs[:dir] = stat.directory?
         # stat.symlink?
+        
+        # attributes special for file system
+        attrs[:updated_at] = stat.mtime
+        
         attrs                  
       rescue Net::SFTP::StatusException
         {}
@@ -79,7 +83,7 @@ module Vos
         exec "rm -r #{path}"
       end
 
-      def each path, &block
+      def each_entry path, &block
         sftp.dir.foreach path do |stat|
           next if stat.name == '.' or stat.name == '..'
           if stat.directory?
@@ -90,14 +94,16 @@ module Vos
         end
       end
       
-      def efficient_dir_copy from, to
+      def efficient_dir_copy from, to, override
+        return false if override # sftp doesn't support this behaviour
+        
         from.storage.open_fs do |from_fs|          
           to.storage.open_fs do |to_fs|
             if from_fs.local? 
               sftp.upload! from.path, fix_path(to.path)
               true
             elsif to_fs.local?
-              sftp.download! fix_path(to.path), from.path, :recursive => true
+              sftp.download! fix_path(from.path), to.path, :recursive => true
               true
             else
               false

data/lib/vos/helpers/ubuntu.rb

@@ -5,7 +5,7 @@ module Vos
         {:DEBIAN_FRONTEND => 'noninteractive'}
       end
       def wrap_cmd env_str, cmd
-        %(. #{env_file.path} && #{env_str}#{' && ' unless env_str.empty?}#{cmd})
+        %(source #{env_file.path} && #{env_str}#{' && ' unless env_str.empty?}#{cmd})
       end
       
       def env_file
@@ -34,14 +34,49 @@ module Vos
 end
 
 module Vfs
+  class Entry
+    def symlink_to entry, options = {}
+      raise "invalid argument!" unless entry.is_a? Entry
+      raise "can't use symlink ('#{self}' and '#{entry}' are on different storages)!" if self.storage != entry.storage
+      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 "#{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?        
+        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 file.is_a? Vos::Box        
+      raise "#{box} must be an Vos::Box" unless box.is_a? Vos::Box        
       
-      copy_to! box.dir('/etc/profile_ext').file(name)
+      remote_file = box.dir('/etc/profile_ext').file(name)
+      copy_to! remote_file
+
+      require_clause = <<-BASH
 
-      require_clause = "source #{remote_file.path}"
-      box.env_file.append "\n#{require_clause}\n" unless env_file.content.include? require_clause
+# #{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

data/readme.md

@@ -13,16 +13,15 @@ Currently, there are following implementations available:
     $ gem install vos
 
 ## Code samples:
-    gem 'vos'                                    # Virtual Operating System
+    gem 'vos'                                         # Virtual Operating System
     require 'vos'
 
-    # Connections, let's deploy our 'cool_app' project from our local box to remote server
-    server = Vfs::Box.new(host: 'cool_app.com', ssh: {user: 'me', password: 'secret'})
+    server = Box.new('cool_app.com')                  # it will use id_rsa, or You can add {user: 'me', password: 'secret'}
     
-    server.bash 'ls'
-    server['apps/cool_app'].bash 'rails production'
+    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][vos] project. 
+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].
   
@@ -39,6 +38,6 @@ configuration tool [Cluster Management][cluster_management].
 - process management (find/kill/filters/attributes)
 - other os resources management (disk)
 
-[vos]: http://github.com/alexeypetrushin/vos
+[vfs]: http://github.com/alexeypetrushin/vfs
 [cluster_management]: http://github.com/alexeypetrushin/cluster_management
 [my_cluster]: http://github.com/alexeypetrushin/my_cluster

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: vos
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+  prerelease: 
+  version: 0.1.4
 platform: ruby
 authors: 
 - Alexey Petrushin
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +03:00
+date: 2011-02-16 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,8 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -38,8 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -51,8 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -102,21 +92,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Virtual Operating System