multi_sync 0.0.1 → 0.0.2

data/lib/multi_sync/target.rb

@@ -3,31 +3,20 @@ require 'lazily'
 require 'virtus'
 require 'pathname'
 require 'celluloid'
+require 'multi_sync/attributes/pathname'
 require 'multi_sync/mixins/log_helper'
 
 module MultiSync
   class Target
-    include Virtus
     include Celluloid
+    include Virtus.model
     include MultiSync::Mixins::LogHelper
-
-    attribute :connection
-    attribute :target_dir, Pathname
-    attribute :destination_dir, Pathname
+    
+    attribute :target_dir, MultiSync::Attributes::Pathname, default: Pathname.new('')
+    attribute :destination_dir, MultiSync::Attributes::Pathname, default: Pathname.new('')
     attribute :credentials, Hash, default: :default_credentials
 
-    # Initialize a new Target object
-    #
-    # @param options [Hash]
-    def initialize(options = {})
-      fail(ArgumentError, 'target_dir must be present') unless options[:target_dir]
-      self.target_dir = Pathname.new(options.fetch(:target_dir, ''))
-      self.destination_dir = Pathname.new(options.fetch(:destination_dir, ''))
-      credentials.merge!(options.fetch(:credentials, {}))
-    end
-
     def default_credentials
-      # deep clone just in case
       Marshal.load(Marshal.dump(MultiSync.credentials))
     end
   end

data/lib/multi_sync/targets/aws_target.rb

@@ -3,13 +3,10 @@ require 'multi_sync/resources/remote_resource'
 
 module MultiSync
   class AwsTarget < Target
-    # Initialize a new AwsTarget object
-    #
-    # @param options [Hash]
-    def initialize(options = {})
-      super(options)
-      self.connection = ::Fog::Storage.new(credentials.merge(provider: :aws))
-    end
+    
+    attribute :connection, Fog::Storage, lazy: true, default: lambda { |target, attribute|
+      Fog::Storage.new(target.credentials.merge(provider: :aws))
+    }
 
     def files
       files = []
@@ -26,8 +23,8 @@ module MultiSync
 
         files << MultiSync::RemoteResource.new(
           file: file,
-          with_root: target_dir + pathname, # pathname seems to already have the prefix (destination_dir)
-          without_root: destination_dir != '' ? pathname.relative_path_from(destination_dir).cleanpath : pathname
+          path_with_root: target_dir + pathname, # pathname seems to already have the prefix (destination_dir)
+          path_without_root: destination_dir != '' ? pathname.relative_path_from(destination_dir).cleanpath : pathname
         )
 
       }
@@ -58,7 +55,7 @@ module MultiSync
     end
 
     def delete(resource)
-      MultiSync.say_status :upload, resource.path_without_root.to_s
+      MultiSync.say_status :delete, resource.path_without_root.to_s
       MultiSync.debug "Delete #{resource.class_name}:'#{resource.path_without_root}' from #{class_name}:'#{File.join('/', target_dir + destination_dir)}'"
       connection.delete_object(target_dir.to_s, (destination_dir + resource.path_without_root).to_s)
       resource

data/lib/multi_sync/targets/local_target.rb

@@ -3,13 +3,10 @@ require 'multi_sync/resources/remote_resource'
 
 module MultiSync
   class LocalTarget < Target
-    # Initialize a new LocalTarget object
-    #
-    # @param options [Hash]
-    def initialize(options = {})
-      super(options)
-      self.connection = ::Fog::Storage.new(credentials.merge(provider: :local))
-    end
+
+    attribute :connection, Fog::Storage, lazy: true, default: lambda { |target, attribute|
+      Fog::Storage.new(target.credentials.merge(provider: :local))
+    }
 
     def files
       files = []
@@ -28,8 +25,8 @@ module MultiSync
 
         files << MultiSync::RemoteResource.new(
           file: file,
-          with_root: target_dir + destination_dir + pathname,
-          without_root: pathname
+          path_with_root: target_dir + destination_dir + pathname,
+          path_without_root: pathname
         )
 
       }

data/lib/multi_sync/version.rb

@@ -1,3 +1,3 @@
 module MultiSync
-  VERSION = '0.0.1' unless defined?(MultiSync::VERSION)
+  VERSION = '0.0.2' unless defined?(MultiSync::VERSION)
 end

data/lib/multi_sync.rb

@@ -80,7 +80,7 @@ module MultiSync
     self.reset_configuration!
   end
 
-  # by rescuing from a LoadError we can sniff out gems in use and try to automagically hook into them
+  # By rescuing from a LoadError we can sniff out gems in use and try to automatically hook into them
   REQUIREMENT_MAP.each do |library, extension|
     begin
       require library

data/lib/tasks/multi_sync_rails.rake

@@ -5,11 +5,17 @@ namespace :assets do
   task :sync => :environment do
     ActiveSupport::Notifications.instrument 'multi_sync.run' do
       MultiSync::Extensions::AssetSync.check_and_migrate
-      MultiSync.run
+      MultiSync.run if MultiSync.run_on_build
     end
   end
 end
 
 Rake::Task['assets:precompile'].enhance do
-  Rake::Task['assets:sync'].invoke if defined?(MultiSync) && MultiSync.run_on_build
+  Rake::Task['assets:sync'].invoke if defined?(MultiSync)
+end
+
+if Rake::Task.task_defined?('assets:precompile:nondigest')
+  Rake::Task['assets:precompile:nondigest'].enhance do
+    Rake::Task['assets:sync'].invoke if defined?(MultiSync)
+  end
 end

data/multi_sync.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_dependency 'fog', '~> 1.12'
+  spec.add_dependency 'fog', '~> 1.2'
   spec.add_dependency 'lazily', '~> 0.1'
-  spec.add_dependency 'virtus', '~> 0.5'
+  spec.add_dependency 'virtus', '~> 1.0'
   spec.add_dependency 'celluloid', '~> 0.15'
   spec.add_dependency 'multi_mime', '~> 1.0'
   spec.add_dependency 'multi_json', '~> 1.7'

data/spec/unit/multi_sync/client_spec.rb

@@ -296,6 +296,9 @@ describe MultiSync::Client, fakefs: true do
           expect(without_destination_dir_target).to have(3).files
         end
       end
+
+      context 'with resource_options' do
+      end
     end
   end
 end

data/spec/unit/multi_sync/resources/local_resource_spec.rb

@@ -9,10 +9,8 @@ describe MultiSync::LocalResource, fakefs: true do
   describe :local do
     context :valid do
       it 'should return correct file details' do
-        resource = MultiSync::LocalResource.new(
-          with_root: Pathname.new('/tmp/local-resource/foo.txt'),
-          without_root: Pathname.new('foo.txt')
-        )
+        # binding.pry
+        resource = MultiSync::LocalResource.new(path_with_root: Pathname.new('/tmp/local-resource/foo.txt'), path_without_root: Pathname.new('foo.txt'))
         expect(resource.body).to eq 'foo'
         expect(resource.content_length).to eq 3
         expect(resource.content_type).to eq 'text/plain'
@@ -24,8 +22,8 @@ describe MultiSync::LocalResource, fakefs: true do
     context :known do
       it 'should return correct file details (with overwritten info)' do
         resource = MultiSync::LocalResource.new(
-          with_root: Pathname.new('/tmp/local-resource/foo.txt'),
-          without_root: Pathname.new('foo.txt'),
+          path_with_root: Pathname.new('/tmp/local-resource/foo.txt'),
+          path_without_root: Pathname.new('foo.txt'),
           content_length: 42,
           mtime: Time.now - 1,
           etag: 'etag'
@@ -41,8 +39,8 @@ describe MultiSync::LocalResource, fakefs: true do
     context :unknown do
       it 'should return default file details' do
         resource = MultiSync::LocalResource.new(
-          with_root: Pathname.new('/tmp/local-resource/missing.txt'),
-          without_root: Pathname.new('missing.txt')
+          path_with_root: Pathname.new('/tmp/local-resource/missing.txt'),
+          path_without_root: Pathname.new('missing.txt')
         )
         expect(resource.body).to eq nil
         expect(resource.content_length).to eq 0

data/spec/unit/multi_sync_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe MultiSync do
-
   context :methods do
-
     describe :version do
       subject { MultiSync::VERSION }
       it { should be_kind_of(String) }
@@ -33,13 +31,10 @@ describe MultiSync do
       subject { MultiSync.respond_to?(:configure) }
       it { should be_true }
     end
-
   end
 
   context :configure do
-
     it 'should allow you to set configuration' do
-
       MultiSync.configure do |config|
         config.verbose = true
         config.target_pool_size = 2
@@ -47,9 +42,6 @@ describe MultiSync do
 
       expect(MultiSync.verbose).to be_true
       expect(MultiSync.target_pool_size).to be 2
-
     end
-
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_sync
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Karl Freeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: lazily
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
@@ -196,110 +196,11 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- examples/custom.rb
-- examples/rails-3-2/.gitignore
-- examples/rails-3-2/Gemfile
-- examples/rails-3-2/README.rdoc
-- examples/rails-3-2/Rakefile
-- examples/rails-3-2/app/assets/images/rails.png
-- examples/rails-3-2/app/assets/javascripts/application.js
-- examples/rails-3-2/app/assets/stylesheets/application.css
-- examples/rails-3-2/app/controllers/application_controller.rb
-- examples/rails-3-2/app/helpers/application_helper.rb
-- examples/rails-3-2/app/mailers/.gitkeep
-- examples/rails-3-2/app/models/.gitkeep
-- examples/rails-3-2/app/views/layouts/application.html.erb
-- examples/rails-3-2/config.ru
-- examples/rails-3-2/config/application.rb
-- examples/rails-3-2/config/asset_sync.yml
-- examples/rails-3-2/config/boot.rb
-- examples/rails-3-2/config/database.yml
-- examples/rails-3-2/config/environment.rb
-- examples/rails-3-2/config/environments/development.rb
-- examples/rails-3-2/config/environments/production.rb
-- examples/rails-3-2/config/environments/test.rb
-- examples/rails-3-2/config/initializers/backtrace_silencers.rb
-- examples/rails-3-2/config/initializers/inflections.rb
-- examples/rails-3-2/config/initializers/mime_types.rb
-- examples/rails-3-2/config/initializers/multi_sync.rb
-- examples/rails-3-2/config/initializers/secret_token.rb
-- examples/rails-3-2/config/initializers/session_store.rb
-- examples/rails-3-2/config/initializers/wrap_parameters.rb
-- examples/rails-3-2/config/locales/en.yml
-- examples/rails-3-2/config/routes.rb
-- examples/rails-3-2/db/seeds.rb
-- examples/rails-3-2/lib/assets/.gitkeep
-- examples/rails-3-2/lib/tasks/.gitkeep
-- examples/rails-3-2/log/.gitkeep
-- examples/rails-3-2/public/404.html
-- examples/rails-3-2/public/422.html
-- examples/rails-3-2/public/500.html
-- examples/rails-3-2/public/favicon.ico
-- examples/rails-3-2/public/index.html
-- examples/rails-3-2/public/robots.txt
-- examples/rails-3-2/script/rails
-- examples/rails-3-2/test/fixtures/.gitkeep
-- examples/rails-3-2/test/functional/.gitkeep
-- examples/rails-3-2/test/integration/.gitkeep
-- examples/rails-3-2/test/performance/browsing_test.rb
-- examples/rails-3-2/test/test_helper.rb
-- examples/rails-3-2/test/unit/.gitkeep
-- examples/rails-4-0/.gitignore
-- examples/rails-4-0/Gemfile
-- examples/rails-4-0/README.rdoc
-- examples/rails-4-0/Rakefile
-- examples/rails-4-0/app/assets/images/.keep
-- examples/rails-4-0/app/assets/javascripts/application.js
-- examples/rails-4-0/app/assets/stylesheets/application.css
-- examples/rails-4-0/app/controllers/application_controller.rb
-- examples/rails-4-0/app/controllers/concerns/.keep
-- examples/rails-4-0/app/helpers/application_helper.rb
-- examples/rails-4-0/app/mailers/.keep
-- examples/rails-4-0/app/models/.keep
-- examples/rails-4-0/app/models/concerns/.keep
-- examples/rails-4-0/app/views/layouts/application.html.erb
-- examples/rails-4-0/bin/bundle
-- examples/rails-4-0/bin/rails
-- examples/rails-4-0/bin/rake
-- examples/rails-4-0/config.ru
-- examples/rails-4-0/config/application.rb
-- examples/rails-4-0/config/asset_sync.yml
-- examples/rails-4-0/config/boot.rb
-- examples/rails-4-0/config/database.yml
-- examples/rails-4-0/config/environment.rb
-- examples/rails-4-0/config/environments/development.rb
-- examples/rails-4-0/config/environments/production.rb
-- examples/rails-4-0/config/environments/test.rb
-- examples/rails-4-0/config/initializers/backtrace_silencers.rb
-- examples/rails-4-0/config/initializers/filter_parameter_logging.rb
-- examples/rails-4-0/config/initializers/inflections.rb
-- examples/rails-4-0/config/initializers/mime_types.rb
-- examples/rails-4-0/config/initializers/multi_sync.rb
-- examples/rails-4-0/config/initializers/secret_token.rb
-- examples/rails-4-0/config/initializers/session_store.rb
-- examples/rails-4-0/config/initializers/wrap_parameters.rb
-- examples/rails-4-0/config/locales/en.yml
-- examples/rails-4-0/config/routes.rb
-- examples/rails-4-0/db/seeds.rb
-- examples/rails-4-0/lib/assets/.keep
-- examples/rails-4-0/lib/tasks/.keep
-- examples/rails-4-0/log/.keep
-- examples/rails-4-0/public/404.html
-- examples/rails-4-0/public/422.html
-- examples/rails-4-0/public/500.html
-- examples/rails-4-0/public/favicon.ico
-- examples/rails-4-0/public/robots.txt
-- examples/rails-4-0/test/controllers/.keep
-- examples/rails-4-0/test/fixtures/.keep
-- examples/rails-4-0/test/helpers/.keep
-- examples/rails-4-0/test/integration/.keep
-- examples/rails-4-0/test/mailers/.keep
-- examples/rails-4-0/test/models/.keep
-- examples/rails-4-0/test/test_helper.rb
 - gemfiles/middleman-3.1.x.gemfile
 - gemfiles/rails-3.2.x.gemfile
 - gemfiles/rails-4.0.x.gemfile
 - lib/multi_sync.rb
+- lib/multi_sync/attributes/pathname.rb
 - lib/multi_sync/client.rb
 - lib/multi_sync/configuration.rb
 - lib/multi_sync/environment.rb

data/examples/custom.rb

@@ -1,34 +0,0 @@
-require "multi_sync"
-
-MultiSync.configuration do |config|
-  # config.verbose = false  # turn on verbose logging (defaults to false)
-  # config.force = false  # force syncing of outdated_files (defaults to false)
-  # config.run_on_build = true # when within a framework which `builds` assets, whether to sync afterwards (defaults to true)
-  # config.sync_outdated_files = true # when an outdated file is found whether to replace it (defaults to true)
-  # config.delete_abandoned_files = true # when an abondoned file is found whether to remove it (defaults to true)
-  # config.upload_missing_files = true # when a missing file is found whether to upload it (defaults to true)
-  # config.target_pool_size = 8 # how many threads you would like to open for each target (defaults to the amount of CPU core's your machine has)
-  # config.max_sync_attempts = 1 # how many times a file should be retried if there was an error during sync (defaults to 3)
-end
-
-MultiSync.run do
-
-  source :build {
-    :type => :local, # :local is the source's type, current options are :local, :manifest
-    :source_dir => "/path_to_your_build_folder",
-    :targets => [ :www ] # an array of target names that this source should sync against
-    # targets optional? default to all
-  }
-
-  target :www {
-    :type => :aws, # :aws is the target's type, current options are :aws
-    :target_dir => "your_aws_bucket",
-    :destination_dir => "an_optional_directory_inside_your_aws_bucket",
-    :credentials => {
-      :region => "us-east-1",
-      :aws_access_key_id => "super_secret",
-      :aws_secret_access_key => "super_secret"
-    }
-  }
-
-end

data/examples/rails-3-2/.gitignore

@@ -1,15 +0,0 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile ~/.gitignore_global
-
-# Ignore bundler config
-/.bundle
-
-# Ignore the default SQLite database.
-/db/*.sqlite3
-
-# Ignore all logfiles and tempfiles.
-/log/*.log
-/tmp

data/examples/rails-3-2/Gemfile

@@ -1,43 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '~> 3.2'
-
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-
-gem 'sqlite3'
-
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
-
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  # gem 'therubyracer', :platforms => :ruby
-
-  gem 'uglifier', '>= 1.0.3'
-end
-
-gem 'jquery-rails'
-
-# To use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
-
-# To use Jbuilder templates for JSON
-# gem 'jbuilder'
-
-# Use unicorn as the app server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger
-# gem 'debugger'
-
-gem 'awesome_print', :require => 'awesome_print'
-gem 'celluloid', :github => 'celluloid/celluloid'
-gem 'multi_mime', :github => 'karlfreeman/multi_mime'
-gem 'multi_sync', :path => '../../'