itamae 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcebb641f8d69d78034939977dce364a755e8b8e
-  data.tar.gz: e7fda0c86ecb529cd3c3ff7c75e13de59a898380
+  metadata.gz: bf80dc0d09edfc8284cab903ab066deae70f24f7
+  data.tar.gz: 3603e62c980190ab27b5b44d776f975315ff6707
 SHA512:
-  metadata.gz: a5cf48bd0271dd80ab9e3e6264e51bd227c6eedd1bd0a8a4c656a48c2ff5cbc74df9d94092c4a6ec2b94fa859b9136a7d98bb4deea21d0c0cbcb2227d143fe8b
-  data.tar.gz: 36792adb8fabf63a1b375dec3c45eaf2569cebecd362a66ad866a51098a55337d981306a61de0be352ee5d275e52d9578778e5b9b3061ea126ae2571febfc3de
+  metadata.gz: ee73911856bdf0999914850ffb578c3eaec682417a7572f38f23f17e45f978d32dd10c5eb0af48e1aee0cb676489d56acdca6cfecd107a5bac90c55b9c412096
+  data.tar.gz: 47dd8eac7815c35c685b78e2063332d7ebdf1a517b77b66e28c97ba6f7cd3a550d5dee9e49d88d08dff5ec8fd494e87766bb1b1708589235d71db4709dcf3a1e

data/lib/itamae.rb

@@ -9,6 +9,7 @@ require "itamae/node"
 require "itamae/backend"
 require "itamae/notification"
 require "itamae/definition"
+require "itamae/config"
 
 module Itamae
   # Your code goes here...

data/lib/itamae/cli.rb

@@ -6,8 +6,9 @@ module Itamae
     class_option :log_level, type: :string, aliases: ['-l'], default: 'info'
     class_option :color, type: :boolean, default: true
 
-    def initialize(*args)
-      super
+    def initialize(args, opts, config)
+      opts = Config.new(opts).load
+      super(args, opts, config)
 
       Itamae::Logger.level = ::Logger.const_get(options[:log_level].upcase)
       Itamae::Logger.formatter.colored = options[:color]

data/lib/itamae/config.rb

@@ -0,0 +1,46 @@
+require 'yaml'
+
+module Itamae
+  class Config
+    CONFIG_MATCHER = /(-c|--config) +([^ ]+)/
+
+    def initialize(options)
+      @options = options
+    end
+
+    def load
+      return @options unless config_given?
+
+      configs, options = parse_options
+      configs.each do |config|
+        options += load_config(config)
+      end
+      options
+    end
+
+    private
+
+    def parse_options
+      configs = []
+      parsed_option = joined_options.gsub(CONFIG_MATCHER).each do |match|
+        configs << Regexp.last_match[2]
+        next ''
+      end
+      [configs, parsed_option.split(' ')]
+    end
+
+    def load_config(config)
+      YAML.load(open(config)).inject([]) do |options, (key, value)|
+        options + ["--#{key}", value.to_s]
+      end
+    end
+
+    def config_given?
+      joined_options =~ CONFIG_MATCHER
+    end
+
+    def joined_options
+      @option ||= @options.join(' ')
+    end
+  end
+end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.9
+1.0.10

data/spec/unit/lib/itamae/config_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+module Itamae
+  describe Config do
+    describe '#load' do
+      subject { config.load }
+
+      let!(:config) { described_class.new(options) }
+
+      context 'without config option' do
+        let(:options) { ['-h', 'example.com'] }
+
+        it { is_expected.to eq(options) }
+      end
+
+      context 'with config option' do
+        let(:yaml) { 'port: 22' }
+
+        before { allow(config).to receive(:open).and_return(yaml) }
+
+        context 'when short option' do
+          let(:options) { ['-h', 'example.com', '-c', 'config.yml'] }
+
+          it { is_expected.to eq(['-h', 'example.com', '--port', '22']) }
+        end
+
+        context 'when long option' do
+          let(:options) { ['-h', 'example.com', '--config', 'config.yml'] }
+
+          it { is_expected.to eq(['-h', 'example.com', '--port', '22']) }
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -156,6 +156,7 @@ files:
 - lib/itamae.rb
 - lib/itamae/backend.rb
 - lib/itamae/cli.rb
+- lib/itamae/config.rb
 - lib/itamae/definition.rb
 - lib/itamae/logger.rb
 - lib/itamae/node.rb
@@ -187,6 +188,7 @@ files:
 - spec/integration/recipes/included.rb
 - spec/integration/recipes/node.json
 - spec/integration/spec_helper.rb
+- spec/unit/lib/itamae/config_spec.rb
 - spec/unit/lib/itamae/logger_spec.rb
 - spec/unit/lib/itamae/node_spec.rb
 - spec/unit/lib/itamae/recipe_spec.rb
@@ -229,6 +231,7 @@ test_files:
 - spec/integration/recipes/included.rb
 - spec/integration/recipes/node.json
 - spec/integration/spec_helper.rb
+- spec/unit/lib/itamae/config_spec.rb
 - spec/unit/lib/itamae/logger_spec.rb
 - spec/unit/lib/itamae/node_spec.rb
 - spec/unit/lib/itamae/recipe_spec.rb