rack2aws 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72ae29bf646a70f2cc5731fbad6ba8a1c61f2115
-  data.tar.gz: 9464c44d339a1a1587795efde4b0d2f622aaebd8
+  metadata.gz: aea0008457829bc7e98f35545a31e64cc51be0b4
+  data.tar.gz: 069002f7d1973c702dcd20446ae8297ad4c57f5b
 SHA512:
-  metadata.gz: 621b2fbfd728276c06cf70e45c5b777b84b740c36cc7ea33ab789a3064c56f51b92562bc4a7017a481aed2565cd692544619f5a084bb40ce670284a2d0e2dfaf
-  data.tar.gz: 903d33fa596f8106bb4d5d2d6a6a1a1d0955135d4918119f078063ffd1450ff2cf68aeae8cb3a6e0d155b556201517d709dff772330e94f12c70957be2edbfe1
+  metadata.gz: a1aee03e5fedf609c2f110c51a590ecc2fbdcf23365624fe7625f894a2bad711c43c4f537d65acf24956bff9ea8be39c5048a7f711e6ab0eeee9965db86deac7
+  data.tar.gz: 39f110bba678f6e60e48c682009a7dc9ed74604fe81a6428871ea983a6b03fb323636d9b34ace726dbffc27d0e62507463bcfd5af8babef4413779b8d890fecc

data/lib/rack2aws.rb

@@ -1,32 +1,34 @@
 require 'fog'
 require 'commander'
 require 'rack2aws/config'
+require 'rack2aws/logger'
 require 'rack2aws/version'
 require 'rack2aws/processor_count'
 
-
 module Rack2Aws
   class FileManager
     include Rack2Aws::Configuration
 
-    attr_reader :per_page, :rackspace, :aws, :rackspace_directory, :aws_directory, :nproc, :verbose_mode, :files, :total
+    attr_reader :per_page, :rackspace, :aws,
+                :rackspace_directory, :aws_directory, :nproc,
+                :verbose_mode, :files, :total, :allow_public
 
     def initialize(options={})
       options = default_options.merge(options)
       @per_page = options[:per_page]
       @rackspace = Fog::Storage.new(RackspaceConfig.load())
       @aws = Fog::Storage.new(AWSConfig.load())
-
-      @rackspace_directory = rackspace.directories.get(options[:rackspace_container])
-      @aws_directory = aws.directories.get(options[:aws_bucket])
+      @rackspace_directory = rackspace.directories.get(options[:container])
+      @aws_directory = aws.directories.get(options[:bucket])
       @nproc = options[:nproc]
+      @allow_public = options[:public]
       @verbose_mode = options[:verbose]
       @files = []
       @total = 0
     end
 
     def default_options
-      { :per_page => 10000 }
+      { :per_page => 10000, :public => false, :verbose => false }
     end
 
     def copy
@@ -86,22 +88,26 @@ module Rack2Aws
       aws_directory.files.create(:key          => file.key,
                                  :body         => file.body,
                                  :content_type => file,
-                                 :public       => false)
+                                 :public       => allow_public)
     end
 
     private :copy_files, :copy_file
   end
 
   class CLI
+    include Rack2Aws::Logger
     include Commander::Methods
     include Rack2Aws::ProcessorCount
 
     def run
       program :name, 'rack2aws'
       program :version, Rack2Aws::VERSION
-      program :description, 'Bridge from Rackspace Cloud Files to AWS S3'
+      program :description, 'Teleport your files from Rackspace Cloud Files to AWS S3'
       program :help, 'Author', 'Faissal Elamraoui <amr.faissal@gmail.com>'
 
+      # Show welcome message
+      show_welcome()
+
       global_option('--verbose', 'Explain what is being done') { $verbose = true }
 
       command :port do |cmd|
@@ -111,6 +117,7 @@ module Rack2Aws
         cmd.option '--container CONTAINER_NAME', String, 'Rackspace Cloud Files container name'
         cmd.option '--bucket BUCKET_NAME', String, 'AWS S3 bucket name'
         cmd.option '--nproc NUM_PROC', Integer, 'Number of processes to fork'
+        cmd.option '--public', 'Whether files should be uploaded as public'
         cmd.action do |args, options|
           if options.container.nil?
             options.container = ask('Rackspace Cloud Files container: ')
@@ -124,12 +131,20 @@ module Rack2Aws
             options.nproc = processor_count()
           end
 
-          FileManager.new({
-                         :rackspace_container => options.container,
-                         :aws_bucket => options.bucket,
-                         :nproc => options.nproc,
-                         :verbose => $verbose
-                       }).copy
+          if !options.public.nil?
+            options.public = if agree(warn("Are you sure you want your files uploaded as public?"))
+                               true
+                             else
+                               nil
+                             end
+          end
+
+          options.verbose = !options.verbose.nil? ? true : nil
+
+          # Remove all nil values from options' __hash__ table
+          options.__hash__.delete_if{ |k,v| v.nil? }
+
+          FileManager.new(options.__hash__).copy
         end
       end
       run!

data/lib/rack2aws/colorizer.rb

@@ -0,0 +1,23 @@
+class String
+  def black;          "\e[30m#{self}\e[0m" end
+  def red;            "\e[31m#{self}\e[0m" end
+  def green;          "\e[32m#{self}\e[0m" end
+  def brown;          "\e[33m#{self}\e[0m" end
+  def blue;           "\e[34m#{self}\e[0m" end
+  def magenta;        "\e[35m#{self}\e[0m" end
+  def cyan;           "\e[36m#{self}\e[0m" end
+  def gray;           "\e[37m#{self}\e[0m" end
+  def bg_black;       "\e[40m#{self}\e[0m" end
+  def bg_red;         "\e[41m#{self}\e[0m" end
+  def bg_green;       "\e[42m#{self}\e[0m" end
+  def bg_brown;       "\e[43m#{self}\e[0m" end
+  def bg_blue;        "\e[44m#{self}\e[0m" end
+  def bg_magenta;     "\e[45m#{self}\e[0m" end
+  def bg_cyan;        "\e[46m#{self}\e[0m" end
+  def bg_gray;        "\e[47m#{self}\e[0m" end
+  def bold;           "\e[1m#{self}\e[22m" end
+  def italic;         "\e[3m#{self}\e[23m" end
+  def underline;      "\e[4m#{self}\e[24m" end
+  def blink;          "\e[5m#{self}\e[25m" end
+  def reverse_color;  "\e[7m#{self}\e[27m" end
+end

data/lib/rack2aws/config.rb

@@ -1,7 +1,6 @@
 require 'rack2aws/props_reader'
 require 'rack2aws/errors'
 
-
 # Class to parse configuration files in the format of "param = value".
 class KVConfigParser
   attr_accessor :config_file, :params, :groups
@@ -149,13 +148,13 @@ module Rack2Aws
 
     class RackspaceConfig
       def self.load()
-        config_path = "#{ENV['HOME']}/.rack/config"
+        @config_path ||= "#{ENV['HOME']}/.rack/config"
 
-        if !File.exist?(config_path)
+        if !File.exist?(@config_path)
           raise FileNotFoundError, "Rackspace configuration file not found"
         end
 
-        props_reader = PropertiesReader.new(config_path)
+        props_reader = PropertiesReader.new(@config_path)
         return {
           :provider => 'Rackspace',
           :rackspace_api_key => props_reader.get("api-key"),
@@ -167,13 +166,13 @@ module Rack2Aws
 
     class AWSConfig
       def self.load()
-        config_path = "#{ENV['HOME']}/.aws/credentials"
+        @config_path ||= "#{ENV['HOME']}/.aws/credentials"
 
-        if !File.exist?(config_path)
-          raise FileNotFoundError, "Rackspace configuration file not found".bold.red
+        if !File.exist?(@config_path)
+          raise FileNotFoundError, "AWS configuration file not found"
         end
 
-        credentials = KVConfigParser.new(config_path)
+        credentials = KVConfigParser.new(@config_path)
         return {
           :provider => 'AWS',
           :region => credentials['default']['region'],

data/lib/rack2aws/logger.rb

@@ -0,0 +1,24 @@
+require 'artii'
+require 'rack2aws/version'
+require 'rack2aws/colorizer'
+
+module Rack2Aws
+  module Logger
+
+    def show_welcome
+      welcome_art = Artii::Base.new
+      $stdout.puts "##############################################################".bold.blue
+      output = welcome_art.asciify("Rack2Aws").bold.blue
+      output << "v#{Rack2Aws::VERSION} (>o<)".bold.blue
+      $stdout.puts output
+      $stdout.puts "#############################################################".bold.blue
+    end
+
+    def warn(msg)
+      output = "WARNING: ".bold
+      output << msg
+      output.brown
+    end
+
+  end
+end

data/lib/rack2aws/version.rb

@@ -1,3 +1,3 @@
 module Rack2Aws
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,20 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: rack2aws
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Faissal Elamraoui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.0
   type: :runtime
@@ -22,6 +25,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.0
 - !ruby/object:Gem::Dependency
@@ -29,6 +35,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.37'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.37.0
   type: :runtime
@@ -36,8 +45,31 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.37'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.37.0
+- !ruby/object:Gem::Dependency
+  name: artii
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +98,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 description: 
 email:
 - amr.faissal@gmail.com
@@ -76,8 +122,10 @@ extra_rdoc_files: []
 files:
 - bin/rack2aws
 - lib/rack2aws.rb
+- lib/rack2aws/colorizer.rb
 - lib/rack2aws/config.rb
 - lib/rack2aws/errors.rb
+- lib/rack2aws/logger.rb
 - lib/rack2aws/processor_count.rb
 - lib/rack2aws/props_reader.rb
 - lib/rack2aws/version.rb
@@ -104,5 +152,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Bridge from Rackspace Cloud Files to AWS S3
+summary: Teleport your files from Rackspace Cloud Files to AWS S3
 test_files: []