cloudify 0.0.3 → 0.0.4

data/lib/cloudify/cloudify.rb

@@ -15,11 +15,12 @@ module Cloudify
     end
 
     def sync
-      config.validate
       if config && config.valid?
         storage.sync
+      elsif config && !config.valid?
+        STDERR.puts "Cloudify: #{config.errors.full_messages.join(', ')}"
       else
-        "Cloudify: Something went wrong"
+        "Cloudify: Something went wrong."
       end
     end
   end

data/lib/cloudify/config.rb

@@ -8,8 +8,7 @@ module Cloudify
                         :rackspace_auth_url, :rackspace_servicenet, :rackspace_cdn_ssl,
                         :ninefold_storage_token,:ninefold_storage_secret,
                         :endpoint, :region, :host, :path, :port, :scheme, :persistent]
-
-    class Invalid < StandardError; end
+    PROVIDERS = ["aws", "google", "rackspace", "ninefold"]
 
     attr_accessor :provider, :force_deletion_sync, :credentials, :assets_directory, :config_path
     
@@ -18,6 +17,7 @@ module Cloudify
     validates_presence_of  :aws_access_key_id, :aws_secret_access_key, :if => Proc.new { |con| con.provider == "aws" }
     validates_presence_of  :rackspace_api_key, :rackspace_username, :if => Proc.new { |con| con.provider == "rackspace" }
     validates_presence_of  :ninefold_storage_token, :ninefold_storage_secret, :if => Proc.new { |con| con.provider == "ninefold" }
+    validates_inclusion_of :provider, :in => PROVIDERS, :message => "%{value} is not supported."
     validates_inclusion_of :force_deletion_sync, :in => [true, false]
 
     def initialize
@@ -33,18 +33,6 @@ module Cloudify
       path = File.join(config_path, "initializers", "cloud_storage_sync.rb")
       File.exists? path
     end
-
-    def validate
-      unless ["aws", "google", "rackspace", "ninefold"].include?(provider)
-        raise ArgumentError.new("#{provider} is not a recognized storage provider")
-      end
-    end
-    
-    def requires(*attrs)
-      attrs.each do |key|
-        raise ArgumentError.new("#{provider.capitalize} requires #{attrs.join(', ')} in configuration files") if self.send(key).nil?
-      end
-    end
     
     def options
       { :assets_directory => assets_directory, :force_deletion_sync => force_deletion_sync }

data/lib/cloudify/version.rb

@@ -1,3 +1,3 @@
 module Cloudify
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/generators/cloudify/templates/cloudify.rake

@@ -1,3 +1,3 @@
 Rake::Task["cloud_storage_sync:sync"].enhance do
-  CloudStorageSync.sync
+  Cloudify.sync
 end

data/spec/cloudify_spec.rb

@@ -18,6 +18,7 @@ describe Cloudify do
       it "should not be valid when google" do
         @config.provider = "google"
         @config.should_not be_valid
+        @config.errors[:provider].should be_empty
         @config.errors[:google_storage_access_key_id].should_not be_empty
         @config.errors[:google_storage_secret_access_key].should_not be_empty
       end
@@ -25,6 +26,7 @@ describe Cloudify do
       it "should not be valid when aws" do
         @config.provider = "aws"
         @config.should_not be_valid
+        @config.errors[:provider].should be_empty
         @config.errors[:aws_secret_access_key].should_not be_empty
         @config.errors[:aws_access_key_id].should_not be_empty
       end
@@ -32,6 +34,7 @@ describe Cloudify do
       it "should not be valid when rackspace" do
         @config.provider = "rackspace"
         @config.should_not be_valid
+        @config.errors[:provider].should be_empty
         @config.errors[:rackspace_username].should_not be_empty
         @config.errors[:rackspace_api_key].should_not be_empty
       end
@@ -39,9 +42,21 @@ describe Cloudify do
       it "should not be valid when ninefold" do
         @config.provider = "ninefold"
         @config.should_not be_valid
+        @config.errors[:provider].should be_empty
         @config.errors[:ninefold_storage_token].should_not be_empty
         @config.errors[:ninefold_storage_secret].should_not be_empty
       end
+
+      it "should not be valid with wrong provider" do
+        @config.provider = "donotexist"
+        @config.should_not be_valid
+        @config.errors[:provider].should_not be_empty
+      end
+
+      it "should not be valid without assets_directory" do
+        @config.should_not be_valid
+        @config.errors[:assets_directory].should_not be_empty
+      end
     end
   end
 end

data/spec/fixtures/cloudify.yml

@@ -10,7 +10,7 @@
 # google_storage_access_key_id: GOOGLE_STORAGE_ACCESS_KEY_ID
 # google_storage_secret_access_key: GOOGLE_STORAGE_SECRET_ACCESS_KEY
 
-## CloudStorageSync supports the following providers: aws, google, ninefold and rackspace
+## Cloudify supports the following providers: aws, google, ninefold and rackspace
 ## For more information on which parameters are required for each provider, visit http://fog.io/1.0.0/storage/
 
 defaults: &defaults

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudify
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2011-11-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2152934620 !ruby/object:Gem::Requirement
+  requirement: &2153041920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -23,10 +23,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2152934620
+  version_requirements: *2153041920
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152934020 !ruby/object:Gem::Requirement
+  requirement: &2153041260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -34,10 +34,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *2152934020
+  version_requirements: *2153041260
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2152926500 !ruby/object:Gem::Requirement
+  requirement: &2153040740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152926500
+  version_requirements: *2153040740
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &2152925700 !ruby/object:Gem::Requirement
+  requirement: &2153039960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -56,7 +56,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152925700
+  version_requirements: *2153039960
 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: 2432946652788188517
+      hash: -91208309299467127
 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: 2432946652788188517
+      hash: -91208309299467127
 requirements: []
 rubyforge_project: cloudify
 rubygems_version: 1.8.10