milc 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 134ae9236cb673f0c1182329f7da5b50f513dc85
-  data.tar.gz: 83b991325dfc2683fe41d392b36e151f3f458c8e
+  metadata.gz: 5735bc7e72aa87ca2f8f91bae8fd2b6394454549
+  data.tar.gz: 93a8cfaf9d61bebbfcf4278706fb9512d4f2e4d2
 SHA512:
-  metadata.gz: f3eed2dd80e4f4d4e26b1dba89c133ef207ac05330949480374463364b3fca1031e6d764d4e15684cc63fdb1a9e4951b537bf8f90aa7856754ea9ceef47367f8
-  data.tar.gz: 17e6a97c1d1ec6b6a1702edb4912ff7cc3167ea202f9388651b6c2de7d6159f50d4413a1cfc1087f9cac620ecb1b3f6d0d365a4b303280800c4481e18661eee5
+  metadata.gz: 2cc1f200024d564b9b8e70d4a4798d023b2233195b182844593d6da0ae9aea84c96242242b4c7b90d09f49d61a7b2bbfa6b00d2567bd8e9682ffa5126d152865
+  data.tar.gz: d64616db530bc58b0bb1f2e33f9aff441f0258e70564e6a5e8cfb806a413eca33f1923a5dc2286ffa45e594c2530f6c155765404cd4a84dcc3a48542a3890cef

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.0
+  - 2.0.0
+  - 2.1.6
+  - 2.2.2
 before_install: gem install bundler --version '>= 1.8.0'

data/lib/milc.rb

@@ -3,10 +3,11 @@ require "milc/version"
 require 'logger'
 
 module Milc
-  autoload :Base, 'milc/base'
-  autoload :Dsl , 'milc/dsl'
+  autoload :Base   , 'milc/base'
+  autoload :Dsl    , 'milc/dsl'
+  autoload :Gcloud , 'milc/gcloud'
 
-  autoload :Gcloud, 'milc/gcloud'
+  autoload :Command, 'milc/command'
 
   class << self
     attr_accessor :dry_run

data/lib/milc/base.rb

@@ -2,11 +2,8 @@
 
 require "milc"
 
-require 'json'
 require 'erb'
 require 'yaml'
-require 'optparse'
-require 'shellwords'
 
 require 'logger_pipe'
 
@@ -19,10 +16,6 @@ end
 
 module Milc
   module Base
-    include Milc::Dsl::Gcloud
-    include Milc::Dsl::Mgcloud
-
-    include Milc::Dsl::Ansible
 
     def logger
       Milc.logger
@@ -34,28 +27,19 @@ module Milc
       block_given? ? yield(res) : res
     end
 
-    def load_from_yaml(yaml_path)
-      @config = YAML.load_file_with_erb(yaml_path)
-      load_config
-    end
-
-    attr_reader :config
+    attr_accessor :config
     attr_reader :project
 
     def dry_run
       Milc.dry_run
     end
 
+    # overriden
     def load_config
       @project = config['PROJECT'] || ENV['PROJECT']
     end
 
-    def show_help_and_exit1
-      ## シェルスクリプトのUsage
-      $stderr.puts help_message
-      exit 1
-    end
-
+    # overriden
     def help_message
       ## スクリプト名
       cmdname = File.basename($0) # $PROGRAM_NAME を推奨
@@ -63,36 +47,8 @@ module Milc
       "Usage: #{cmdname} -c CONF_FILE"
     end
 
-    def command_options
-      "nVc:" # n と V と c: は必須
-    end
-
+    # overriden
     def load_options(options)
-      if options["c"]
-        load_from_yaml(options["c"])
-      else
-        show_help_and_exit1
-      end
-    end
-
-    def setup(args)
-      # ARGV.getopts については以下を参照
-      # http://d.hatena.ne.jp/zariganitosh/20140819/ruby_optparser_true_power
-      # http://docs.ruby-lang.org/ja/2.1.0/method/OptionParser=3a=3aArguable/i/getopts.html
-      args.extend(OptionParser::Arguable) unless args.is_a?(OptionParser::Arguable)
-      options = args.getopts(command_options)
-      show_help_and_exit1 unless args.empty?
-
-      Milc.dry_run = !!options["n"]
-      Milc.verbose = !!options["V"]
-
-      load_options(options)
-    end
-
-    def run(args)
-      setup(args)
-      process
-      # exit 0
     end
 
   end

data/lib/milc/command.rb

@@ -0,0 +1,57 @@
+# coding: utf-8
+require 'milc'
+
+require 'optparse'
+
+module Milc
+  class Command
+
+    attr_reader :logic
+    def initialize(logic)
+      @logic = logic
+    end
+
+    def run(args)
+      setup(args)
+      logic.process
+      # exit 0
+    end
+
+    def setup(args)
+      # ARGV.getopts については以下を参照
+      # http://d.hatena.ne.jp/zariganitosh/20140819/ruby_optparser_true_power
+      # http://docs.ruby-lang.org/ja/2.1.0/method/OptionParser=3a=3aArguable/i/getopts.html
+      args.extend(OptionParser::Arguable) unless args.is_a?(OptionParser::Arguable)
+      options = args.getopts(command_options)
+      show_help_and_exit1 unless args.empty?
+
+      Milc.dry_run = !!options["n"]
+      Milc.verbose = !!options["V"]
+
+      load_options(options)
+    end
+
+    # overriden
+    def command_options
+      "nVc:" # n と V と c: は必須
+    end
+
+    def show_help_and_exit1
+      ## シェルスクリプトのUsage
+      $stderr.puts logic.help_message
+      exit 1
+    end
+
+    def load_options(options)
+      if options["c"]
+        yaml_path = options["c"]
+        logic.config = YAML.load_file_with_erb(yaml_path)
+        logic.load_config
+      else
+        show_help_and_exit1
+      end
+      logic.load_options(options)
+    end
+
+  end
+end

data/lib/milc/dsl/gcloud.rb

@@ -1,5 +1,7 @@
 require "milc/dsl"
 
+require 'json'
+
 module Milc::Dsl
   module Gcloud
 

data/lib/milc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: milc
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-11 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger_pipe
@@ -101,6 +101,7 @@ files:
 - exe/milc
 - lib/milc.rb
 - lib/milc/base.rb
+- lib/milc/command.rb
 - lib/milc/dsl.rb
 - lib/milc/dsl/ansible.rb
 - lib/milc/dsl/gcloud.rb