itamae 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18368b7f1a365a5f69bc861932b70e6caad8f00f
-  data.tar.gz: 4ebf0701af6779fdf6b9dab09adf9954bf82f733
+  metadata.gz: 1638b5d146f89a94ea442567a8d7f54b5e770055
+  data.tar.gz: 88b9dbfc9d74db2008e89c3dd31ca4da5fe05640
 SHA512:
-  metadata.gz: 207fdcec0840d1fbe014ebea9180e3d9aa99edb76eebf1b2d0e38090f318dac832908cf8c2348abe861ba8a2958243e6d68603a56495f7c06c9261d5e2b00f78
-  data.tar.gz: 688ba0b4062ee18d648c8cc8729f5757bb9e28d494a38c8af9df0bc7568d12d06bd6b909de53fd2aec2f84b9eb08bf7274bafebdf438b8b7d1a868d7b965c9ce
+  metadata.gz: 98f3995c772b038282d7afc6f4741ae1360000bbe3ac022e8bf159f26819c87c4bfbabf7dcaa9384dd62a2adae6b96de324553952ae45ae2a07911a671ea6e45
+  data.tar.gz: 655e435f1a1e0976efb9f722dfa9b9b22179374721ef8b4730d9e0306b2cdaef5ae7950aaf85bc660e83463a83ac3838a2f28058e9e30d2ee37d8dc83b36ca90

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v1.8.0
+
+Features
+
+- [`generate` and `destroy` subcommands to manipulate cookbooks and roles (by @k0kubun)](https://github.com/itamae-kitchen/itamae/pull/176)
+
+Improvements
+
+- [Fallback to autoload resource plugin (by @k0kubun)](https://github.com/itamae-kitchen/itamae/pull/179)
+
 ## v1.7.0
 
 No change

data/lib/itamae.rb

@@ -9,11 +9,8 @@ require "itamae/node"
 require "itamae/backend"
 require "itamae/notification"
 require "itamae/definition"
-require "itamae/config"
 require "itamae/ext"
-
 require "itamae/generators"
-require "itamae/generators/project"
 
 module Itamae
   # Your code goes here...

data/lib/itamae/cli.rb

@@ -3,12 +3,14 @@ require 'thor'
 
 module Itamae
   class CLI < Thor
+    GENERATE_TARGETS = %w[cookbook role].freeze
+
     class_option :log_level, type: :string, aliases: ['-l'], default: 'info'
     class_option :color, type: :boolean, default: true
+    class_option :config, type: :string, aliases: ['-c']
 
-    def initialize(args, opts, config)
-      opts = Config.new(opts).load
-      super(args, opts, config)
+    def initialize(*)
+      super
 
       Itamae.logger.level = ::Logger.const_get(options[:log_level].upcase)
       Itamae.logger.formatter.colored = options[:color]
@@ -80,5 +82,41 @@ module Itamae
       generator.invoke_all
     end
 
+    desc 'generate [cookbook|role] [NAME]', 'Initialize role or cookbook (short-cut alias: "g")'
+    map 'g' => 'generate'
+    def generate(target, name)
+      validate_generate_target!('generate', target)
+
+      generator = Generators.find(target).new
+      generator.destination_root = File.join("#{target}s", name)
+      generator.copy_files
+    end
+
+    desc 'destroy [cookbook|role] [NAME]', 'Undo role or cookbook (short-cut alias: "d")'
+    map 'd' => 'destroy'
+    def destroy(target, name)
+      validate_generate_target!('destroy', target)
+
+      generator = Generators.find(target).new
+      generator.destination_root = File.join("#{target}s", name)
+      generator.remove_files
+    end
+
+    private
+    def options
+      @itamae_options ||= super.dup.tap do |options|
+        if config = options[:config]
+          options.merge!(YAML.load_file(config))
+        end
+      end
+    end
+
+    def validate_generate_target!(command, target)
+      unless GENERATE_TARGETS.include?(target)
+        msg = %Q!ERROR: "itamae #{command}" was called with "#{target}" !
+        msg << "but expected to be in #{GENERATE_TARGETS.inspect}"
+        fail InvocationError, msg
+      end
+    end
   end
 end

data/lib/itamae/generators.rb

@@ -1,4 +1,20 @@
+require "itamae/generators/cookbook"
+require "itamae/generators/project"
+require "itamae/generators/role"
+
 module Itamae
   module Generators
+    def self.find(target)
+      case target
+      when 'cookbook'
+        Cookbook
+      when 'project'
+        Project
+      when 'role'
+        Role
+      else
+        raise "Unexpected target: #{target}"
+      end
+    end
   end
 end

data/lib/itamae/generators/cookbook.rb

@@ -0,0 +1,22 @@
+require 'thor'
+require 'thor/group'
+
+module Itamae
+  module Generators
+    class Cookbook < Thor::Group
+      include Thor::Actions
+
+      def self.source_root
+        File.expand_path('../templates/cookbook', __FILE__)
+      end
+
+      def copy_files
+        directory '.'
+      end
+
+      def remove_files
+        remove_file '.'
+      end
+    end
+  end
+end

data/lib/itamae/generators/role.rb

@@ -0,0 +1,22 @@
+require 'thor'
+require 'thor/group'
+
+module Itamae
+  module Generators
+    class Role < Thor::Group
+      include Thor::Actions
+
+      def self.source_root
+        File.expand_path('../templates/role', __FILE__)
+      end
+
+      def copy_files
+        directory '.'
+      end
+
+      def remove_files
+        remove_file '.'
+      end
+    end
+  end
+end

data/lib/itamae/resource.rb

@@ -34,11 +34,20 @@ module Itamae
           begin
             ::Itamae::Plugin::Resource.const_get(to_camel_case(method.to_s))
           rescue NameError
-            raise Error, "#{method} resource is missing."
+            autoload_plugin_resource(method)
           end
         end
       end
 
+      def autoload_plugin_resource(method)
+        begin
+          require "itamae/plugin/resource/#{method}"
+          ::Itamae::Plugin::Resource.const_get(to_camel_case(method.to_s))
+        rescue LoadError, NameError
+          raise Error, "#{method} resource is missing."
+        end
+      end
+
       def define_resource(name, klass)
         class_name = to_camel_case(name.to_s)
         if Resource.const_defined?(class_name)

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.7.0
+1.8.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-06 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -205,15 +205,22 @@ files:
 - lib/itamae.rb
 - lib/itamae/backend.rb
 - lib/itamae/cli.rb
-- lib/itamae/config.rb
 - lib/itamae/definition.rb
 - lib/itamae/ext.rb
 - lib/itamae/ext/specinfra.rb
 - lib/itamae/generators.rb
+- lib/itamae/generators/cookbook.rb
 - lib/itamae/generators/project.rb
+- lib/itamae/generators/role.rb
+- lib/itamae/generators/templates/cookbook/default.rb
+- lib/itamae/generators/templates/cookbook/files/.keep
+- lib/itamae/generators/templates/cookbook/templates/.keep
 - lib/itamae/generators/templates/project/Gemfile
 - lib/itamae/generators/templates/project/cookbooks/.keep
 - lib/itamae/generators/templates/project/roles/.keep
+- lib/itamae/generators/templates/role/default.rb
+- lib/itamae/generators/templates/role/files/.keep
+- lib/itamae/generators/templates/role/templates/.keep
 - lib/itamae/logger.rb
 - lib/itamae/node.rb
 - lib/itamae/notification.rb
@@ -254,7 +261,6 @@ files:
 - spec/integration/recipes/templates/template_auto.erb
 - spec/integration/spec_helper.rb
 - spec/unit/lib/itamae/backend_spec.rb
-- spec/unit/lib/itamae/config_spec.rb
 - spec/unit/lib/itamae/node_spec.rb
 - spec/unit/lib/itamae/recipe_spec.rb
 - spec/unit/lib/itamae/resource/base_spec.rb
@@ -303,7 +309,6 @@ test_files:
 - spec/integration/recipes/templates/template_auto.erb
 - spec/integration/spec_helper.rb
 - spec/unit/lib/itamae/backend_spec.rb
-- spec/unit/lib/itamae/config_spec.rb
 - spec/unit/lib/itamae/node_spec.rb
 - spec/unit/lib/itamae/recipe_spec.rb
 - spec/unit/lib/itamae/resource/base_spec.rb

data/lib/itamae/config.rb

@@ -1,46 +0,0 @@
-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/spec/unit/lib/itamae/config_spec.rb

@@ -1,35 +0,0 @@
-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