cloud-crowd 0.7.2.pre2 → 0.7.2.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52dd0cc70040d2355b346798e7f7b4a68fc20790
-  data.tar.gz: a86c0faa035fa9872c9fe19d389bdc7f96ea6213
+  metadata.gz: 1c5f2f377aa25b5ea78af2c99af7219a76ac0b8d
+  data.tar.gz: 8384b661a4d74ba176691d2f67fafefb72a97fb7
 SHA512:
-  metadata.gz: 26f4e373c3d11637ebb3276a64987f8df8f0b3aa507f90d8ffffbef910fe0e2da58f07d8caaff4bc50c0a4fdec29c1890f12059447d71a2bffdf88810c5d798c
-  data.tar.gz: dcde328b2667fac7c16b5c186a683ee3d79ff9df476b082a83257897f672b45e0b8c2d5b3f5df673694960da4a2233ba2874cc2f2e3ce7b1c3e668964d6a5948
+  metadata.gz: 1d489373d585cfaec82992e6b4ccee7986f47722bed078a096d9731b32ac7cc11bef9f1fe0c27bda36bfcf84aa9ab8f2892ebbd7414618a7703b2b9b990ef336
+  data.tar.gz: 0935c56a1f968dcb00f919378620cfaa79b12fa3edd602c5bf50a9a64e2c1f4c3282693f67c8c99fc0399992659daf8df8e7a27b718da0871383df009f6315cd

data/cloud-crowd.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name      = 'cloud-crowd'
-  s.version   = '0.7.2.pre2'         # Keep version in sync with cloud-cloud.rb
+  s.version   = '0.7.2.pre3'         # Keep version in sync with cloud-cloud.rb
   s.date      = '2014-04-06'
 
   s.homepage    = "http://wiki.github.com/documentcloud/cloud-crowd"

data/lib/cloud_crowd/asset_store/s3_store.rb

@@ -1,4 +1,4 @@
-gem 'right_aws'
+require 'aws'
 
 module CloudCrowd
   class AssetStore
@@ -14,11 +14,8 @@ module CloudCrowd
         key, secret = CloudCrowd.config[:aws_access_key], CloudCrowd.config[:aws_secret_key]
         valid_conf  = [bucket_name, key, secret].all? {|s| s.is_a? String }
         raise Error::MissingConfiguration, "An S3 account must be configured in 'config.yml' before 's3' storage can be used" unless valid_conf
-        protocol    = @use_auth ? 'https' : 'http'
-        port        = @use_auth ? 443 : 80
-        @s3         = RightAws::S3.new(key, secret, :protocol => protocol, :port => port)
-        @bucket     = @s3.bucket(bucket_name)
-        @bucket     = @s3.bucket(bucket_name, true) unless @bucket
+        @s3         = ::AWS::S3.new(:access_key_id => key, :secret_access_key => secret, :secure => !!@use_auth)
+        @bucket     = (@s3.buckets[bucket_name].exists? ? @s3.buckets[bucket_name] : @s3.buckets.create(bucket_name))
       end
 
       # Save a finished file from local storage to S3. Save it publicly unless

data/lib/cloud_crowd/node.rb

@@ -65,6 +65,7 @@ module CloudCrowd
 
     # When creating a node, specify the port it should run on.
     def initialize(options={})
+      super()
       require 'json'
       CloudCrowd.identity = :node
       @central          = CloudCrowd.central_server

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-crowd
 version: !ruby/object:Gem::Version
-  version: 0.7.2.pre2
+  version: 0.7.2.pre3
 platform: ruby
 authors:
 - Jeremy Ashkenas