cloud_files_transfer 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dabcc887bc5df0a719dbabb7d7a93c0bf1c9695
-  data.tar.gz: 64df41679c66aec92b13afe93a00584ff4b141ff
+  metadata.gz: 356cd5bc6fd194469f9562ddd87c3d5b36064f3e
+  data.tar.gz: e25d1224aa740f0d72b90ab9c53713ada43f3f30
 SHA512:
-  metadata.gz: d721ead167abba4749178b9264352cf8bef0863c900482ba6e13be7bb14882155fd199fac20836cf785221f09bb32df528fcf1e0188b6c50172088327402ddf6
-  data.tar.gz: 1b8d64255dcf5e9714827a512064b97b4a8d7955e8b6e12a084b6d646c31df03eb359154f4b6c29bfa0e12212f33135fbf3f9e85fdbb1475c0ed0374af52cb62
+  metadata.gz: 6151c334ea081670d8d2afc55cf8a3c5641f9632ffa2021d47edb63479693e05a9f1fb354d2340a59cb110e3a4c87031338c6baa864f0eae0016185de500fbe1
+  data.tar.gz: c9284dd36d6e6d502a5ab5ee238e792af2477c384bb509a9d4141137c466ffc03f43b469d9cc481551b9d3a6a6dd32837a41e72e26338105940cb5a4a9e51d0e

data/README.md

@@ -21,15 +21,20 @@ Or install it yourself as:
 Have Rackspace username, api key and container name ready for both origin and destination folders.
 Or add a config yaml file to automatically pick the info from:
 
-    origin:
-      username: rackspace_username
-      api_key: 1234567890abcdefghijklmnopqrstuv
-      container: container_name
-
-    destination:
-      username: rackspace_username
-      api_key: 1234567890abcdefghijklmnopqrstuv
-      container: container_name
+```yaml
+# config/cloudfiles.yml
+origin:
+  username: rackspace_username
+  api_key: 1234567890abcdefghijklmnopqrstuv
+  container: container_name
+
+destination:
+  username: rackspace_username
+  api_key: 1234567890abcdefghijklmnopqrstuv
+  container: container_name
+```
+
+Then launch the rake task to start the transfer. It doesn't matter where you do it from. It could be faster though if done from a Rackspace instance using service net (snet).
 
     $ rake cloud_files_assets:transfer
 

data/lib/cloud_files_transfer/client.rb

@@ -1,12 +1,13 @@
 module CloudFilesTransfer
   class Client
 
-    attr_accessor :username, :api_key, :container_name, :connection
+    attr_accessor :username, :api_key, :container_name, :snet, :connection
 
     def initialize(args={})
-      @username       = args.fetch(:username, credentials[:rackspace_username])
-      @api_key        = args.fetch(:api_key, credentials[:rackspace_api_key])
-      @container_name = args.fetch(:container, CarrierWave::Uploader::Base.fog_directory)
+      @username       = args.fetch(:username) { raise 'Missing username'}
+      @api_key        = args.fetch(:api_key) { raise 'Missing api_key'}
+      @container_name = args.fetch(:container) { raise 'Missing container'}
+      @snet           = args.fetch(:snet, false)
       @connection     = args.fetch(:connection, create_connection)
     end
 
@@ -17,14 +18,10 @@ module CloudFilesTransfer
     private
 
     def create_connection
-      c = CloudFiles::Connection.new(username: username, api_key: api_key)
+      c = CloudFiles::Connection.new(username: username, api_key: api_key, snet: snet)
       puts "Connection established."
       c
     end
 
-    def credentials
-      @credentials ||= CarrierWave::Uploader::Base.fog_credentials
-    end
-
   end
 end

data/lib/cloud_files_transfer/transfer.rb

@@ -10,7 +10,7 @@ module CloudFilesTransfer
     end
 
     def self.copy!(origin, destination, path, args={})
-      return if destination.object_exists?(path)
+      return skip_message(path) if destination.object_exists?(path)
       new(origin, destination, path, args).copy
     end
 
@@ -32,5 +32,11 @@ module CloudFilesTransfer
       end
     end
 
+    private
+
+    def skip_message path
+      puts "#{path} skipped."
+    end
+
   end
 end

data/lib/cloud_files_transfer/version.rb

@@ -1,3 +1,3 @@
 module CloudFilesTransfer
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/tasks/cloud_files_assets.rake

@@ -3,30 +3,38 @@ namespace :cloud_files_assets do
   desc "Copy assets from one container to another container"
   task transfer: :environment do
 
-    config    = YAML.load_file("config/cloudfiles.yml")
+    config = YAML.load_file("config/cloudfiles.yml")
+    config = HashWithIndifferentAccess.new(config)
 
-    username      = config["origin"]["username"] rescue ask("Origin username:")
-    api_key       = config["origin"]["api_key"] rescue ask("Origin API key:")
-    container     = config["origin"]["container"] rescue ask("Origin container name:")
+    username      = config[:origin][:username] rescue ask("Origin username:")
+    api_key       = config[:origin][:api_key] rescue ask("Origin API key:")
+    container     = config[:origin][:container] rescue ask("Origin container name:")
+    snet          = config[:origin][:snet] rescue false
     @client_from  = CloudFilesTransfer::Client.new(
       username: username,
       api_key: api_key,
-      container: container
+      container: container,
+      snet: snet
     )
 
     username      = config["destination"]["username"] rescue ask("Destination username:")
     api_key       = config["destination"]["api_key"] rescue ask("Destination API key:")
     container     = config["destination"]["container"] rescue ask("Destination container name:")
+    snet          = config["destination"]["snet"] rescue false
     @client_to    = CloudFilesTransfer::Client.new(
       username: username,
       api_key: api_key,
-      container: container
+      container: container,
+      snet: snet
     )
 
     @container_from = @client_from.container
     @container_to   = CloudFilesTransfer::Container.new(@client_to.container)
+    @assets = @container_from.objects
 
-    @container_from.objects.each do |path|
+    puts "Starting transfer. #{@assets.size} files to copy."
+
+    @assets.each do |path|
       CloudFilesTransfer::Transfer.copy!(@container_from, @container_to, path)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloud_files_transfer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Mathieu Gagné
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cloudfiles