cloudify 0.0.8 → 0.0.9

data/Rakefile

@@ -1,6 +1,23 @@
+require 'rake/testtask'
+require 'rspec/core/rake_task'
 # Use Rakefile for tasks that operate on the plugin’s source files, such as special testing or documentation. 
 # These must be run from the plugin’s directory.
 
 # rakes = Dir["#{File.dirname(__FILE__)}/lib/tasks/*.rake"]
 # rakes.sort.each { |ext| load ext; puts ext }
-Bundler::GemHelper.install_tasks
+Bundler::GemHelper.install_tasks
+
+task :default => :test
+
+desc 'Run ALL OF the specs'
+RSpec::Core::RakeTask.new(:spec)
+
+desc "Run Cloudify generator tests."
+Rake::TestTask.new(:test_unit)do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+task :test => [ :test_unit, :spec ]

data/lib/cloudify/storage.rb

@@ -25,14 +25,17 @@ module Cloudify
     end
 
     def local_files
-      @local_files ||= Dir.glob("#{Rails.root.to_s}/public/**/*").map do |f| 
-        next if File.directory?(f)
-        Digest::MD5.hexdigest(File.read(f))
+      @local_files ||= Dir.glob("#{Rails.root.to_s}/public/**/*").map do |f|         
+        Digest::MD5.hexdigest(File.read(f)) unless File.directory?(f)
       end
     end
     
     def remote_files
-      @remote_files ||= bucket.files.map{ |f| f.etag }
+      @remote_files ||= bucket.files.reload.map{ |f| f.etag }
+    end
+
+    def files_to_delete
+      @files_to_delete ||= (local_files | remote_files) - (local_files & remote_files)
     end
 
     def upload_new_and_changed_files
@@ -53,7 +56,6 @@ module Cloudify
 
     def delete_unsynced_remote_files
       STDERR.puts "Deleting remote files that no longer exist locally"
-      files_to_delete = (local_files | remote_files) - (local_files & remote_files)
       bucket.files.each do |f|
         if files_to_delete.include?(f.etag)
           STDERR.puts "D #{f.key}"
@@ -67,6 +69,5 @@ module Cloudify
       delete_unsynced_remote_files if options[:force_deletion_sync] == true
       STDERR.puts "Done"
     end
-
   end
 end

data/lib/cloudify/version.rb

@@ -1,3 +1,3 @@
 module Cloudify
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/cloudify_spec.rb

@@ -178,6 +178,20 @@ describe Cloudify::Storage do
     @storage = Cloudify::Storage.new(@config.credentials, @config.options)
   end
 
+  it "Uploads a collection of files for the 1st time and doesn't delete them" do
+    this_file = File.read(__FILE__)
+    this_file_digest = Digest::MD5.hexdigest(this_file)
+    this_file_path   = __FILE__
+    files = @storage.stub(:local_files).and_return([YML_DIGEST, this_file_digest])
+    Dir.stub(:glob).and_return([YML_FILE_PATH, this_file_path])
+    @storage.local_files.length.should  == 2
+    @storage.options[:force_deletion_sync] = true
+    Fog::Storage::AWS::File.any_instance.stub(:etag).and_return(YML_DIGEST)
+    @storage.sync
+    @storage.bucket.files.reload.length.should == 2
+    @storage.bucket.files.each { |k| k.destroy }
+  end
+
   it "Uploads a new file and then deletes it" do
     @storage.stub(:local_files).and_return([YML_DIGEST])
     Dir.stub(:glob).and_return([YML_FILE_PATH])

data/test/install_generator_test.rb

@@ -1,13 +1,14 @@
-require File.join(File.dirname(__FILE__), 'test_helper')
+require "test_helper"
 
 class InstallGeneratorTest < Rails::Generators::TestCase
   tests Cloudify::InstallGenerator
-  destination File.expand_path("../tmp", File.dirname(__FILE__))
+  destination File.expand_path("../../tmp", File.dirname(__FILE__))
   setup :prepare_destination
   setup :run_generator
 
   test "Assert all files are properly created" do
-    assert_file "lib/tasks/cloudify.rake"
+    run_generator
+    assert_file "config/initializers/cloudify.rb"
   end
 
 end

data/test/test_helper.rb

@@ -1,5 +1,4 @@
 require "test/unit"
-require "rubygems"
 require "rails"
-require File.join(File.dirname(__FILE__), '../', 'lib', 'generators', 
-  'cloudify', 'install_generator')
+require "rails/generators/test_case"
+require  "generators/cloudify/install/install_generator"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudify
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-24 00:00:00.000000000Z
+date: 2011-11-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2152671840 !ruby/object:Gem::Requirement
+  requirement: &2152530880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2152671840
+  version_requirements: *2152530880
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2153546460 !ruby/object:Gem::Requirement
+  requirement: &2156896000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *2153546460
+  version_requirements: *2156896000
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2153648020 !ruby/object:Gem::Requirement
+  requirement: &2156976420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153648020
+  version_requirements: *2156976420
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &2160179900 !ruby/object:Gem::Requirement
+  requirement: &2157044560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,7 +56,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160179900
+  version_requirements: *2157044560
 description: Sync your assets hosts to Amazon, Google & Rackspace services
 email:
 - amed@tractical.com
@@ -103,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4128178571950917991
+      hash: 1107229434259926300
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4128178571950917991
+      hash: 1107229434259926300
 requirements: []
 rubyforge_project: cloudify
 rubygems_version: 1.8.10