carthage_cache 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 680503dd25d688ef0de26e7ad3e95365fdedd443
-  data.tar.gz: 67f39166f2b86ae62d5d269802858b97a74a96cf
+  metadata.gz: 651775418076478a9fcb6ee5ba6f309b30a4a69a
+  data.tar.gz: 873fd418cf0782056954992dfdf7820a8c48f86d
 SHA512:
-  metadata.gz: 3a9e552b4de67020ca75fec23e3be966a846c914b65602c7f4e9cd692bd2c344abb09dc75534419085966cf594393068d52176d2b022b8d779c0c253bb4f8884
-  data.tar.gz: e904e08651ae39d53897495b030b23798998d4ec9ba6920f7c1671adc3e045aa3bc29a10cbafb52abb1a56aeba39f3514b1c78307f14cef1cd66eb9a34ea9a68
+  metadata.gz: 3b22d9d6a9281e1b568bba3daad57bbbe4b0b04c0e8437b08580c7b880d76acab6f2ff3cd40659f11a483992fad8d642a9742f5d7bc67d7c1f6dc83372f44518
+  data.tar.gz: 66a2de4ef7c86a3abdb0139342aea9666895969b089483ae7ae06b8f549a65e82ee96cef9639899854ee7adcfe6928979001e09e2e26662e0c83dfd0d2eead45

data/exe/carthage_cache

@@ -65,13 +65,8 @@ command :config do |c|
   c.description = "Generates a '#{CarthageCache::Configurator::CONFIG_FILE_NAME}' config file."
   c.action do |args, options|
     configurator = CarthageCache::Configurator.new(args.first || ".")
-    config = {}
-    config[:bucket_name] = ask "What is the Amazon S3 bucket name? [#{CarthageCache::Repository::DEFAULT_BUCKET_NAME}]"
-    config[:aws_s3_client_options] = {}
-    config[:aws_s3_client_options][:region] = ask "What is the Amazon S3 region?"
-    config[:aws_s3_client_options][:access_key_id] = password "What is the AWS access key?"
-    config[:aws_s3_client_options][:secret_access_key] = password " What is the AWS secret access key?"
-    config.delete_if { |k,v| k == :bucket_name && v == "" }
+    wizard = CarthageCache::ConfiguratorWizard.new(method(:ask), method(:password))
+    config = wizard.start
     configurator.save_config(config)
   end
 end

data/lib/carthage_cache.rb

@@ -7,7 +7,9 @@ require "carthage_cache/carthage_resolved_file"
 require "carthage_cache/project"
 require "carthage_cache/repository"
 require "carthage_cache/terminal"
+require "carthage_cache/configuration"
 require "carthage_cache/configurator"
+require "carthage_cache/configurator_wizard"
 
 module CarthageCache
 
@@ -19,13 +21,13 @@ module CarthageCache
     attr_reader :archiver
     attr_reader :repository
     attr_reader :project
-    attr_reader :configurator
+    attr_reader :config
 
     def initialize(project_path, verbose, config)
       @terminal = Terminal.new(verbose)
       @archiver = Archiver.new
-      @configurator = Configurator.new(project_path, config)
-      @repository = Repository.new(configurator.config[:bucket_name], configurator.config[:aws_s3_client_options])
+      @config = Configurator.new(project_path, config).config
+      @repository = Repository.new(@config.bucket_name, @config.hash_object[:aws_s3_client_options])
       @project = Project.new(project_path, CACHE_DIR_NAME, terminal)
     end
 

data/lib/carthage_cache/archiver.rb

@@ -8,9 +8,9 @@ module CarthageCache
     end
 
     def unarchive(archive_path, destination_path)
-      `unzip #{archive_path} -d #{destination_path} > /dev/null`
+      `unzip -o #{archive_path} -d #{destination_path} > /dev/null`
     end
 
   end
-  
+
 end

data/lib/carthage_cache/configuration.rb

@@ -0,0 +1,100 @@
+require "yaml"
+
+module CarthageCache
+
+  class Configuration
+
+    def self.supported_keys
+      @supported_keys ||= []
+    end
+
+    def self.config_key(name)
+      supported_keys << name
+    end
+
+    def self.valid?(config)
+      config[:bucket_name]                                &&
+      config.has_key?(:aws_s3_client_options)             &&
+      config[:aws_s3_client_options][:region]             &&
+      config[:aws_s3_client_options][:access_key_id]      &&
+      config[:aws_s3_client_options][:secret_access_key]
+    end
+
+    def self.parse(str)
+      config = YAML.load(str)
+      raise "Invalid configuration" unless valid?(config)
+      new(config)
+    end
+
+    def self.default
+      @default ||= Configuration.new({
+        aws_s3_client_options: {
+          region: ENV['AWS_REGION'],
+          access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+          secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
+        }
+      })
+    end
+
+    config_key :bucket_name
+    config_key :aws_region
+    config_key :aws_access_key_id
+    config_key :aws_secret_access_key
+
+    attr_reader :hash_object
+
+    def initialize(hash_object = {})
+      @hash_object = hash_object
+    end
+
+    def to_yaml
+      hash_object.to_yaml
+    end
+
+    def valid?
+      self.class.valid?(hash_object)
+    end
+
+    def merge(c)
+      if c.is_a?(Hash)
+        @hash_object = hash_object.merge(c)
+      else
+        @hash_object = hash_object.merge(c.hash_object)
+      end
+      self
+    end
+
+    def method_missing(method_sym, *arguments, &block)
+      method_name = method_sym.to_s
+      key = method_name.chomp("=")
+      return super if !self.class.supported_keys.include?(key.to_sym)
+      config, key = extract_config_and_key(key)
+
+      if method_name.end_with?("=")
+        config[key] = arguments.first
+      else
+        config[key]
+      end
+    end
+
+    def respond_to?(method_sym, include_private = false)
+      if self.class.supported_keys.include?(method_sym)
+        true
+      else
+        super
+      end
+    end
+
+    private
+
+      def extract_config_and_key(method_name)
+        if method_name =~ /^aws_(.*)$/
+          [hash_object[:aws_s3_client_options] ||= {}, $1.to_sym]
+        else
+          [hash_object, method_name.to_sym]
+        end
+      end
+
+  end
+
+end

data/lib/carthage_cache/configurator.rb

@@ -11,7 +11,7 @@ module CarthageCache
 
     def initialize(project_path, base_config = {})
       @config_file_path = File.join(project_path, CONFIG_FILE_NAME)
-      @base_config = default_configuration.merge(base_config)
+      @base_config = merge_config(base_config)
     end
 
     def config
@@ -19,9 +19,8 @@ module CarthageCache
     end
 
     def save_config(config)
-      if valid?(config)
-        File.open(config_file_path, 'w') { |f| f.write config.to_yaml }
-      end
+      raise "Invalid configuration" unless config.valid?
+      File.open(config_file_path, 'w') { |f| f.write config.to_yaml }
     end
 
     private
@@ -32,35 +31,30 @@ module CarthageCache
 
       def load_config
         if config_file_exist?
-          config = YAML.load(File.read(config_file_path))
-          raise "Invalid config file" unless valid?(config)
+          config = Configuration.parse(File.read(config_file_path))
           config.merge(base_config)
         else
           base_config
         end
       end
 
-      def valid?(config)
-        config.has_key?(:aws_s3_client_options)             &&
-        config[:aws_s3_client_options][:region]             &&
-        config[:aws_s3_client_options][:access_key_id]      &&
-        config[:aws_s3_client_options][:secret_access_key]
-      end
-
-      def deep_symbolize_keys(object)
-        return object.inject({}) { |memo,(k,v)| memo[k.to_sym] = deep_symbolize_keys(v); memo } if object.is_a? Hash
-        return object.inject([]) { |memo,v    | memo          << deep_symbolize_keys(v); memo } if object.is_a? Array
-        return object
+      def remove_nil_keys(hash)
+        hash.inject({}) do |new_hash, (k,v)|
+          unless v.nil? || (v.respond_to?(:empty?) && v.empty?)
+            if v.class == Hash
+              cleaned_hashed = remove_nil_keys(v)
+              new_hash[k] = cleaned_hashed unless cleaned_hashed.empty?
+            else
+              new_hash[k] = v
+            end
+          end
+          new_hash
+        end
       end
 
-      def default_configuration
-        config = {
-          aws_s3_client_options: {}
-        }
-        config[:aws_s3_client_options][:region] = ENV['AWS_REGION'] if ENV['AWS_REGION']
-        config[:aws_s3_client_options][:access_key_id] = ENV['AWS_ACCESS_KEY_ID'] if ENV['AWS_ACCESS_KEY_ID']
-        config[:aws_s3_client_options][:secret_access_key] = ENV['AWS_SECRET_ACCESS_KEY'] if ENV['AWS_SECRET_ACCESS_KEY']
-        config.delete_if { |k, v| k == :aws_s3_client_options && v.empty? }
+      def merge_config(config)
+        new_config = Configuration.default.hash_object.merge(config)
+        Configuration.new(remove_nil_keys(new_config))
       end
 
   end

data/lib/carthage_cache/configurator_wizard.rb

@@ -0,0 +1,37 @@
+module CarthageCache
+
+  class ConfiguratorWizard
+
+    def initialize(ask_proc, password_proc)
+      @ask_proc = ask_proc
+      @password_proc = password_proc
+    end
+
+    def start
+      config = Configuration.new
+      config.bucket_name = ask("What is the Amazon S3 bucket name?", ENV["CARTHAGE_CACHE_DEFAULT_BUCKET_NAME"])
+      config.aws_region = ask("What is the Amazon S3 region?")
+      config.aws_access_key_id = password("What is the AWS access key?")
+      config.aws_secret_access_key = password(" What is the AWS secret access key?")
+      config
+    end
+
+    private
+
+      def ask(message, default_value = nil)
+        message = "#{message} [#{default_value}]" if default_value
+        answer = @ask_proc.call(message)
+        if answer.empty?
+          default_value
+        else
+          answer
+        end
+      end
+
+      def password(message)
+        @password_proc.call(message)
+      end
+
+  end
+
+end

data/lib/carthage_cache/repository.rb

@@ -4,14 +4,12 @@ module CarthageCache
 
   class Repository
 
-    DEFAULT_BUCKET_NAME = "carthage-cache"
-
     attr_reader :client
     attr_reader :bucket_name
 
     def initialize(bucket_name, client_options = {})
       @client = ::Aws::S3::Client.new(client_options)
-      @bucket_name = bucket_name || DEFAULT_BUCKET_NAME
+      @bucket_name = bucket_name
     end
 
     def archive_exist?(archive_filename)

data/lib/carthage_cache/version.rb

@@ -1,3 +1,3 @@
 module CarthageCache
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carthage_cache
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Guido Marucci Blas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,7 +123,9 @@ files:
 - lib/carthage_cache/archive_installer.rb
 - lib/carthage_cache/archiver.rb
 - lib/carthage_cache/carthage_resolved_file.rb
+- lib/carthage_cache/configuration.rb
 - lib/carthage_cache/configurator.rb
+- lib/carthage_cache/configurator_wizard.rb
 - lib/carthage_cache/description.rb
 - lib/carthage_cache/project.rb
 - lib/carthage_cache/repository.rb