vos 0.3.15 → 0.4.0

data/Rakefile

@@ -4,6 +4,7 @@ project(
   name: "vos",
   gem: true,
   summary: "Virtual Operating System",
+  version: '0.4.0',
 
   author: "Alexey Petrushin",
   homepage: "http://github.com/alexeypetrushin/vos"

data/lib/vos.rb

@@ -2,14 +2,15 @@ raise 'ruby 1.9.2 or higher required!' if RUBY_VERSION < '1.9.2'
 
 require 'vos/gems'
 
-require 'open3'
+require 'vfs'
 
-%w(
-  support
+module Vos
+  module Drivers
+  end
+end
 
+%w(
   drivers/local
-  drivers/ssh_vfs_storage
-  drivers/ssh
 
   box/shell
   box/marks
@@ -19,6 +20,14 @@ require 'open3'
   helpers/ubuntu
 ).each{|f| require "vos/#{f}"}
 
+# Vos::Drivers.class_eval do
+#   autoload :SshVfsStorage, 'vos/drivers/ssh_vfs_storage'
+#   autoload :Ssh,           'vos/drivers/ssh'
+#
+#   autoload :S3VfsStorage, 'vos/drivers/s3_vfs_storage'
+#   autoload :S3,           'vos/drivers/s3'
+# end
+
 unless $vos_dont_mess_with_global_namespace
   Box = Vos::Box
 end

data/lib/vos/box.rb

@@ -22,6 +22,7 @@ module Vos
       else
         raise 'invalid arguments'
       end
+      @driver.box = self
     end
 
 

data/lib/vos/box/vfs.rb

@@ -2,7 +2,7 @@ module Vos
   class Box
     module Vfs
       def to_entry
-        '/'.to_entry_on(self)
+        '/'.to_entry_on(self.driver)
       end
 
       def to_file
@@ -38,7 +38,13 @@ end
 module Vfs
   class Dir
     def bash cmd, *args
-      storage.bash_without_path "cd #{path} && #{cmd}", *args
+      driver.box.bash_without_path "cd #{path} && #{cmd}", *args
+    end
+  end
+
+  class << self
+    def default_driver
+      ::Vos::Box.local.driver
     end
   end
 end

data/lib/vos/drivers/local.rb

@@ -1,21 +1,12 @@
-require 'vfs/storages/local'
+require 'open3'
+require 'fileutils'
+
+require 'vfs/drivers/local'
 
 module Vos
   module Drivers
-    class Local
-      def initialize root = ''
-        @root = root
-      end
-
-      #
-      # Vfs
-      #
-      include Vfs::Storages::Local::LocalVfsHelper
-      def open &block
-        block.call self if block
-      end
-      def close; end
-
+    class Local < Vfs::Drivers::Local
+      attr_accessor :box
 
       #
       # Shell
@@ -37,11 +28,9 @@ module Vos
         return code, stdout_and_stderr
       end
 
-
       #
       # Other
       #
-      def to_s; '' end
       def host; 'localhost' end
     end
   end

data/lib/vos/drivers/s3.rb

@@ -4,14 +4,14 @@ require 'vos/drivers/s3_vfs_storage'
 module Vos
   module Drivers
     class S3
+      attr_accessor :box
       attr_reader :connection, :bucket
 
-      DEFAULT_OPTIONS = {
-        # public: true
-      }
-
-      def initialize initialization_options, options = {}
-        @initialization_options, @options = initialization_options, DEFAULT_OPTIONS.merge(options)
+      def initialize options = {}
+        options = options.clone
+        @bucket_name = options.delete(:bucket) || raise("S3 bucket not provided!")
+        @acl = options.delete(:acl) || :public_read
+        @options = options
       end
 
 
@@ -32,11 +32,8 @@ module Vos
           end
         else
           unless connection
-            @connection = ::AWS::S3.new self.initialization_options.clone
-            unless bucket = options[:bucket]
-              raise("S3 bucket not provided (use Vos::Drivers::S3.new({initialization options ...}, {bucket: '<bucket_name>'}))!")
-            end
-            @bucket = @connection.buckets[bucket]
+            @connection = ::AWS::S3.new self.options.clone
+            @bucket = @connection.buckets[bucket_name]
           end
         end
       end
@@ -52,7 +49,7 @@ module Vos
       #
       # Miscellaneous
       #
-      def inspect; "<#{self.class.name} #{initialization_options.inspect}, #{options.inspect}>" end
+      def inspect; "<#{self.class.name} #{options.merge(bucket: bucket_name).inspect}>" end
       alias_method :to_s, :inspect
 
       def _clear
@@ -60,7 +57,7 @@ module Vos
       end
 
       protected
-        attr_reader :initialization_options, :options
+        attr_reader :options, :bucket_name, :acl
     end
   end
 end

data/lib/vos/drivers/s3_vfs_storage.rb

@@ -23,24 +23,19 @@ module Vos
         return {dir: true, file: false} if path.empty?
 
         file = bucket.objects[path]
-
-        attrs = {}
-        file_exists = file.exists?
-        attrs[:file] = file_exists
-        if file_exists
+        if file.exists?
+          attrs = {}
+          attrs[:file] = true
           attrs[:dir] = false
-        elsif dir_exists? path
-          attrs[:dir] = true
-        else
-          return nil
-        end
-
-        if file_exists
           attrs[:size] = file.content_length
           attrs[:updated_at] = file.last_modified
+          attrs
+        # There's no dirs, always returning false
+        # elsif dir_exists? path
+        #   attrs[:dir] = true
+        else
+          return nil
         end
-
-        attrs
       end
 
       def set_attributes path, attrs
@@ -58,21 +53,18 @@ module Vos
 
       def write_file original_path, append, &block
         path = normalize_path original_path
-        # TODO2 Performance lost, extra call to check file existence
-        file = bucket.objects[path]
-        file_exist = file.exists?
-        raise "can't write, file #{original_path} already exist!" if !append and file_exist
 
+        file = bucket.objects[path]
         if append
           # there's no support for :append in Fog, so we just mimic it
           writer = Writer.new
-          writer.write file.read if file_exist
+          writer.write file.read if file.exists?
           block.call writer
-          file.write writer.data
+          file.write writer.data, acl: acl
         else
           writer = Writer.new
           block.call writer
-          file.write writer.data
+          file.write writer.data, acl: acl
         end
       end
 

data/lib/vos/drivers/ssh.rb

@@ -1,16 +1,20 @@
 require 'net/ssh'
 require 'net/sftp'
+require 'vos/drivers/ssh_vfs_storage'
 
 module Vos
   module Drivers
     class Ssh
+      attr_accessor :box
+
       DEFAULT_OPTIONS = {
         config: true
       }
 
-      def initialize options = {}, root = ''
+      def initialize options = {}
+        options = options.clone
         raise ":host not provided!" unless options[:host]
-        @root = root
+        @root = options.delete(:root) || ''
         @options = DEFAULT_OPTIONS.merge options
 
         # config_options = Net::SSH.configuration_for(options[:host])

data/lib/vos/gems.rb

@@ -1,6 +1,3 @@
-gem 'net-ssh'
-gem 'net-sftp'
-
 if respond_to? :fake_gem
   fake_gem 'vfs'
 end

data/lib/vos/helpers/ubuntu.rb

@@ -37,13 +37,9 @@ 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
+      raise "can't use symlink ('#{self}' and '#{entry}' are on different storages)!" if self.driver != entry.driver
+      raise "symlink target '#{entry}' not exist!" unless entry.exist?
+      driver.box.bash "ln -sf #{entry.path} #{path}"
     end
   end
 
@@ -54,9 +50,9 @@ module Vfs
       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}")
+        Box.local.bash("rsync -e 'ssh' -al --delete --stats --progress #{path}/ root@#{entry.driver.host}:#{entry.path}")
       elsif entry.local? and !local?
-        Box.local.bash("rsync -e 'ssh' -al --delete --stats --progress root@#{storage.host}:#{path}/ #{entry.path}")
+        Box.local.bash("rsync -e 'ssh' -al --delete --stats --progress root@#{driver.host}:#{path}/ #{entry.path}")
       else
         raise "invalid usage!"
       end

data/spec/box_spec.rb

@@ -4,8 +4,8 @@ describe Vos::Box do
   with_tmp_spec_dir
 
   before do
-    storage = Vos::Drivers::Local.new spec_dir
-    @box = Vos::Box.new storage
+    driver = Vos::Drivers::Local.new root: spec_dir
+    @box = Vos::Box.new driver
     @box.stub :puts
   end
 

data/spec/config.example.yml

@@ -6,8 +6,6 @@
   # :password: some_password
 
 :s3:
-  :driver:
-    :access_key_id:     'xxx'
-    :secret_access_key: 'xxx'
-
-  :bucket: :xxx
+  :access_key_id:     'xxx'
+  :secret_access_key: 'xxx'
+  :bucket:            :xxx

data/spec/config.yml

@@ -2,8 +2,6 @@
   :host: universal.4ire.net
 
 :s3:
-  :driver:
-    :access_key_id:     'AKIAJRX4FEUREBQ6IYTQ'
-    :secret_access_key: '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'
-
-  :bucket: :vostest
+  :access_key_id:     'AKIAJRX4FEUREBQ6IYTQ'
+  :secret_access_key: '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'
+  :bucket:            :vostest

data/spec/drivers/local_spec.rb

@@ -4,17 +4,17 @@ describe Vos::Drivers::Local do
   with_tmp_spec_dir
 
   before do
-    @storage = @driver = Vos::Drivers::Local.new(spec_dir)
+    @driver = Vos::Drivers::Local.new root: spec_dir
   end
 
   it_should_behave_like "vos driver"
 
-  it_should_behave_like 'vfs storage basic'
-  it_should_behave_like 'vfs storage attributes basic'
-  it_should_behave_like 'vfs storage files'
-  it_should_behave_like 'vfs storage full attributes for files'
-  it_should_behave_like 'vfs storage dirs'
-  it_should_behave_like 'vfs storage full attributes for dirs'
-  it_should_behave_like 'vfs storage query'
-  it_should_behave_like 'vfs storage tmp dir'
+  it_should_behave_like 'vfs driver basic'
+  it_should_behave_like 'vfs driver attributes basic'
+  it_should_behave_like 'vfs driver files'
+  it_should_behave_like 'vfs driver full attributes for files'
+  it_should_behave_like 'vfs driver dirs'
+  it_should_behave_like 'vfs driver full attributes for dirs'
+  it_should_behave_like 'vfs driver query'
+  it_should_behave_like 'vfs driver tmp dir'
 end

data/spec/drivers/s3_spec.rb

@@ -1,28 +1,25 @@
 require 'drivers/spec_helper'
 
 require 'aws' rescue LoadError
-
 if defined? AWS
-  require 'vos/drivers/s3'
-
   describe 'S3' do
     before :all do
-      @storage = Vos::Drivers::S3.new(config[:s3][:driver], bucket: config[:s3][:bucket])
-      @storage.open
+      @driver = Vos::Drivers::S3.new config[:s3]
+      @driver.open
     end
-    after(:all){@storage.close}
+    after(:all){@driver.close}
 
-    before{@storage._clear}
-    after{@storage._clear}
+    before{@driver._clear}
+    after{@driver._clear}
 
-    it_should_behave_like 'vfs storage basic'
-    it_should_behave_like 'vfs storage attributes basic'
-    it_should_behave_like 'vfs storage files'
+    it_should_behave_like 'vfs driver basic'
+    it_should_behave_like 'vfs driver attributes basic'
+    it_should_behave_like 'vfs driver files'
 
     describe 'limited attributes' do
       it "attributes for files" do
-        @storage.write_file('/file', false){|w| w.write 'something'}
-        attrs = @storage.attributes('/file')
+        @driver.write_file('/file', false){|w| w.write 'something'}
+        attrs = @driver.attributes('/file')
         attrs[:file].should be_true
         attrs[:dir].should  be_false
         # attrs[:created_at].class.should == Time
@@ -33,53 +30,46 @@ if defined? AWS
 
     describe 'limited tmp' do
       it "tmp dir" do
-        @storage.tmp.should_not be_nil
+        @driver.tmp.should_not be_nil
 
         file_path = nil
-        @storage.tmp do |tmp_dir|
+        @driver.tmp do |tmp_dir|
           file_path = "#{tmp_dir}/file"
-          @storage.write_file(file_path, false){|w| w.write 'something'}
+          @driver.write_file(file_path, false){|w| w.write 'something'}
         end
         file_path.should_not be_nil
-        @storage.attributes(file_path).should be_nil
+        @driver.attributes(file_path).should be_nil
       end
     end
 
     describe 'limited dirs' do
       def create_s3_fake_dir dir
-        @storage.write_file("#{dir}/file.txt", false){|w| w.write 'something'}
+        @driver.write_file("#{dir}/file.txt", false){|w| w.write 'something'}
       end
 
-      it "directory crud" do
-        @storage.attributes('/dir').should be_nil
-
-        create_s3_fake_dir('/dir')
-        attrs = @storage.attributes('/dir')
-        attrs[:file].should be_false
-        attrs[:dir].should  be_true
-
-        @storage.delete_dir('/dir')
-        @storage.attributes('/dir').should be_nil
+      it "there's no directories, so it should always return false" do
+        @driver.attributes('/dir').should be_nil
+        @driver.write_file('/dir/file.txt', false){|w| w.write 'something'}
+        @driver.attributes('/dir').should be_nil
       end
 
       it 'should delete not-empty directories' do
-        create_s3_fake_dir('/dir')
-        create_s3_fake_dir('/dir/dir2')
-        @storage.write_file('/dir/dir2/file', false){|w| w.write 'something'}
-        @storage.attributes('/dir').should_not be_nil
+        @driver.write_file('/dir/dir2/file', false){|w| w.write 'something'}
+        @driver.attributes('/dir/dir2/file').should_not be_nil
 
-        @storage.delete_dir('/dir')
-        @storage.attributes('/dir').should be_nil
+        @driver.delete_dir('/dir')
+        @driver.attributes('/dir/dir2/file').should be_nil
       end
 
       it 'each' do
-        # -> {@storage.each_entry('/not_existing_dir', nil){|path, type| list[path] = type}}.should raise_error
+        # -> {@driver.each_entry('/not_existing_dir', nil){|path, type| list[path] = type}}.should raise_error
 
-        create_s3_fake_dir('/dir/dir2')
-        @storage.write_file('/dir/file', false){|w| w.write 'something'}
+        @driver.write_file('/dir/file', false){|w| w.write 'something'}
+        @driver.write_file('/dir/dir2/file', false){|w| w.write 'something'}
+        @driver.write_file('/other_dir/file', false){|w| w.write 'something'}
 
         list = {}
-        @storage.each_entry('/dir', nil){|path, type| list[path] = type}
+        @driver.each_entry('/dir', nil){|path, type| list[path] = type}
         list.should == {'dir2' => :dir, 'file' => :file}
       end
     end

data/spec/drivers/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
 require 'yaml'
 
-require 'vfs/storages/specification'
+require 'vfs/drivers/specification'
 require 'vos/drivers/specification'

data/spec/drivers/ssh_spec.rb

@@ -2,7 +2,7 @@ require 'drivers/spec_helper'
 
 describe Vos::Drivers::Ssh do
   before :all do
-    @storage = @driver = Vos::Drivers::Ssh.new(config[:ssh_driver], '/vos_test')
+    @driver = @driver = Vos::Drivers::Ssh.new(config[:ssh_driver].merge(root: '/vos_test'))
     @driver.open
   end
 
@@ -18,16 +18,16 @@ describe Vos::Drivers::Ssh do
 
   it_should_behave_like "vos driver"
 
-  it_should_behave_like 'vfs storage basic'
-  it_should_behave_like 'vfs storage attributes basic'
-  it_should_behave_like 'vfs storage files'
-  it_should_behave_like 'vfs storage dirs'
-  it_should_behave_like 'vfs storage tmp dir'
+  it_should_behave_like 'vfs driver basic'
+  it_should_behave_like 'vfs driver attributes basic'
+  it_should_behave_like 'vfs driver files'
+  it_should_behave_like 'vfs driver dirs'
+  it_should_behave_like 'vfs driver tmp dir'
 
   describe 'limited ssh attributes' do
     it "attributes for dirs" do
-      @storage.create_dir('/dir')
-      attrs = @storage.attributes('/dir')
+      @driver.create_dir('/dir')
+      attrs = @driver.attributes('/dir')
       attrs[:file].should be_false
       attrs[:dir].should  be_true
       # attrs[:created_at].class.should == Time
@@ -36,8 +36,8 @@ describe Vos::Drivers::Ssh do
     end
 
     it "attributes for files" do
-      @storage.write_file('/file', false){|w| w.write 'something'}
-      attrs = @storage.attributes('/file')
+      @driver.write_file('/file', false){|w| w.write 'something'}
+      attrs = @driver.attributes('/file')
       attrs[:file].should be_true
       attrs[:dir].should  be_false
       # attrs[:created_at].class.should == Time

data/spec/spec_helper.rb

@@ -2,6 +2,10 @@ require 'rspec_ext'
 require 'ruby_ext'
 require 'vos'
 
+require 'vos/drivers/local'
+require 'vos/drivers/ssh'
+require 'vos/drivers/s3'
+
 rspec do
   def config
     dir = File.dirname __FILE__

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vos
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-25 00:00:00.000000000Z
+date: 2011-09-08 00:00:00.000000000Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: &2785270 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2785270
-- !ruby/object:Gem::Dependency
-  name: net-sftp
-  requirement: &2784970 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2784970
 - !ruby/object:Gem::Dependency
   name: vfs
-  requirement: &2784680 !ruby/object:Gem::Requirement
+  requirement: &2832540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2784680
+  version_requirements: *2832540
 description: 
 email: 
 executables: []
@@ -65,7 +43,6 @@ files:
 - lib/vos/drivers/ssh_vfs_storage.rb
 - lib/vos/gems.rb
 - lib/vos/helpers/ubuntu.rb
-- lib/vos/support.rb
 - lib/vos.rb
 - spec/box_spec/emptygit
 - spec/box_spec.rb

data/lib/vos/support.rb

@@ -1,39 +0,0 @@
-require 'fileutils'
-require 'net/ssh'
-require 'net/sftp'
-
-require 'vfs'
-Vfs.class_eval do
-  class << self
-    def default_storage
-      ::Vos::Box.local
-    end
-  end
-end
-
-# class File
-#   class << self
-#     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
-#   end
-# end