itamae-mitsurin 0.4 → 0.7

data/lib/{itamae → itamae-mitsurin}/resource/gem_package.rb

@@ -1,6 +1,6 @@
-require 'itamae'
+require 'itamae-mitsurin'
 
-module Itamae
+module ItamaeMitsurin
   module Resource
     class GemPackage < Base
       define_attribute :action, default: :install

data/lib/{itamae → itamae-mitsurin}/resource/git.rb

@@ -1,6 +1,6 @@
-require 'itamae'
+require 'itamae-mitsurin'
 
-module Itamae
+module ItamaeMitsurin
   module Resource
     class Git < Base
       DEPLOY_BRANCH = "deploy"

data/lib/{itamae → itamae-mitsurin}/resource/group.rb

@@ -1,6 +1,6 @@
-require 'itamae'
+require 'itamae-mitsurin'
 
-module Itamae
+module ItamaeMitsurin
   module Resource
     class Group < Base
       define_attribute :action, default: :create

data/lib/{itamae → itamae-mitsurin}/resource/http_request.rb

@@ -1,8 +1,8 @@
-require 'itamae'
+require 'itamae-mitsurin'
 require 'uri'
 require 'net/https'
 
-module Itamae
+module ItamaeMitsurin
   module Resource
     class HttpRequest < File
       RedirectLimitExceeded = Class.new(StandardError)
@@ -33,7 +33,7 @@ module Itamae
             if redirects_followed < attributes.redirect_limit
               uri = URI.parse(response["location"])
               redirects_followed += 1
-              Itamae.logger.debug "Following redirect #{redirects_followed}/#{attributes.redirect_limit}"
+              ItamaeMitsurin.logger.debug "Following redirect #{redirects_followed}/#{attributes.redirect_limit}"
             else
               raise RedirectLimitExceeded
             end

data/lib/{itamae → itamae-mitsurin}/resource/link.rb

@@ -1,6 +1,6 @@
-require 'itamae'
+require 'itamae-mitsurin'
 
-module Itamae
+module ItamaeMitsurin
   module Resource
     class Link < Base
       define_attribute :action, default: :create

data/lib/{itamae → itamae-mitsurin}/resource/local_ruby_block.rb

@@ -1,6 +1,6 @@
-require 'itamae'
+require 'itamae-mitsurin'
 
-module Itamae
+module ItamaeMitsurin
   module Resource
     class LocalRubyBlock < Base
       define_attribute :action, default: :run

data/lib/{itamae → itamae-mitsurin}/resource/package.rb

@@ -1,6 +1,6 @@
-require 'itamae'
+require 'itamae-mitsurin'
 
-module Itamae
+module ItamaeMitsurin
   module Resource
     class Package < Base
       define_attribute :action, default: :install

data/lib/{itamae → itamae-mitsurin}/resource/remote_directory.rb

@@ -1,6 +1,6 @@
-require 'itamae'
+require 'itamae-mitsurin'
 
-module Itamae
+module ItamaeMitsurin
   module Resource
     class RemoteDirectory < Base
       define_attribute :action, default: :create
@@ -44,11 +44,11 @@ module Itamae
           diff = run_command(["diff", "-u", attributes.path, @temppath], error: false)
           if diff.exit_status == 0
             # no change
-            Itamae.logger.debug "directory content will not change"
+            ItamaeMitsurin.logger.debug "directory content will not change"
           else
-            Itamae.logger.info "diff:"
+            ItamaeMitsurin.logger.info "diff:"
             diff.stdout.each_line do |line|
-              Itamae.logger.info "#{line.strip}"
+              ItamaeMitsurin.logger.info "#{line.strip}"
             end
           end
         end

data/lib/{itamae → itamae-mitsurin}/resource/remote_file.rb

@@ -1,6 +1,6 @@
-require 'itamae'
+require 'itamae-mitsurin'
 
-module Itamae
+module ItamaeMitsurin
   module Resource
     class RemoteFile < File
       SourceNotFoundError = Class.new(StandardError)
@@ -27,7 +27,7 @@ module Itamae
             source_file_exts.each do |ext|
               path = ::File.join(@recipe.dir, source_file_dir, "#{dirs[i..-1].join("/")}#{ext}")
               if ::File.exist?(path)
-                Itamae.logger.debug "#{path} is used as a source file."
+                ItamaeMitsurin.logger.debug "#{path} is used as a source file."
                 return path
               else
                 searched_paths << path

data/lib/{itamae → itamae-mitsurin}/resource/service.rb

@@ -1,6 +1,6 @@
-require 'itamae'
+require 'itamae-mitsurin'
 
-module Itamae
+module ItamaeMitsurin
   module Resource
     class Service < Base
       define_attribute :action, default: :nothing

data/lib/{itamae → itamae-mitsurin}/resource/template.rb

@@ -1,8 +1,8 @@
-require 'itamae'
+require 'itamae-mitsurin'
 require 'erb'
 require 'tempfile'
 
-module Itamae
+module ItamaeMitsurin
   module Resource
     class Template < RemoteFile
       define_attribute :variables, type: Hash, default: {}

data/lib/{itamae → itamae-mitsurin}/resource/user.rb

@@ -1,6 +1,6 @@
-require 'itamae'
+require 'itamae-mitsurin'
 
-module Itamae
+module ItamaeMitsurin
   module Resource
     class User < Base
       define_attribute :action, default: :create

data/lib/{itamae → itamae-mitsurin}/runner.rb

@@ -1,12 +1,12 @@
-require 'itamae'
+require 'itamae-mitsurin'
 require 'json'
 require 'yaml'
 
-module Itamae
+module ItamaeMitsurin
   class Runner
     class << self
       def run(recipe_files, backend_type, options)
-        Itamae.logger.info "Starting Itamae..."
+        ItamaeMitsurin.logger.info "Starting Itamae..."
 
         backend = Backend.create(backend_type, options)
         runner = self.new(backend, options)
@@ -68,7 +68,7 @@ module Itamae
     end
 
     def save_dependency_graph(path)
-      Itamae.logger.info "Writing recipe dependency graph to #{path}..."
+      ItamaeMitsurin.logger.info "Writing recipe dependency graph to #{path}..."
       open(path, 'w') do |f|
         f.write(children.dependency_in_dot)
       end
@@ -87,23 +87,23 @@ module Itamae
       if @options[:ohai]
         unless @backend.run_command("which ohai", error: false).exit_status == 0
           # install Ohai
-          Itamae.logger.info "Installing Chef package... (to use Ohai)"
+          ItamaeMitsurin.logger.info "Installing Chef package... (to use Ohai)"
           @backend.run_command("curl -L https://www.opscode.com/chef/install.sh | bash")
         end
 
-        Itamae.logger.info "Loading node data via ohai..."
+        ItamaeMitsurin.logger.info "Loading node data via ohai..."
         hash.merge!(JSON.parse(@backend.run_command("ohai").stdout))
       end
 
       if @options[:node_json]
         path = File.expand_path(@options[:node_json])
-        Itamae.logger.info "Loading node data from #{path}..."
+        ItamaeMitsurin.logger.info "Loading node data from #{path}..."
         hash.merge!(JSON.load(open(path)))
       end
 
       if @options[:node_yaml]
         path = File.expand_path(@options[:node_yaml])
-        Itamae.logger.info "Loading node data from #{path}..."
+        ItamaeMitsurin.logger.info "Loading node data from #{path}..."
         hash.merge!(YAML.load(open(path)) || {})
       end
 

data/lib/{itamae/mitsurin → itamae-mitsurin}/version.rb

@@ -1,5 +1,3 @@
-module Itamae
-  module Mitsurin
+module ItamaeMitsurin
   VERSION = File.read(File.expand_path("../version.txt", __FILE__)).strip
-  end
 end

data/lib/itamae-mitsurin/version.txt

@@ -0,0 +1 @@
+0.7

data/test/test_itamae-mitsurin.rb

@@ -0,0 +1,18 @@
+require 'test/unit'
+require "itamae-mitsurin/runner"
+require "itamae-mitsurin/cli"
+require "itamae-mitsurin/recipe"
+require "itamae-mitsurin/resource"
+require "itamae-mitsurin/handler"
+require "itamae-mitsurin/handler_proxy"
+require "itamae-mitsurin/recipe_children"
+require "itamae-mitsurin/logger"
+require "itamae-mitsurin/node"
+require "itamae-mitsurin/backend"
+require "itamae-mitsurin/notification"
+require "itamae-mitsurin/definition"
+require "itamae-mitsurin/ext"
+
+module TestItamaeMitsurin
+  # Your code goes here...
+end

data/test/test_itamae-mitsurin/ext/test_specinfra.rb

@@ -0,0 +1,39 @@
+# TODO: Send patches to Specinfra
+
+module Specinfra
+  module Backend
+    class Base
+      def receive_file(from, to = nil)
+        raise NotImplementedError
+      end
+    end
+
+    class Exec < Base
+      def receive_file(from, to = nil)
+        if to
+          FileUtils.cp(from, to)
+        else
+          ::File.read(from)
+        end
+      end
+    end
+
+    class Ssh < Exec
+      def receive_file(from, to = nil)
+        scp_download!(from, to)
+      end
+
+      private
+
+      def scp_download!(from, to, opt={})
+        if get_config(:scp).nil?
+          set_config(:scp, create_scp)
+        end
+
+        scp = get_config(:scp)
+        scp.download!(from, to, opt)
+      end
+    end
+  end
+end
+

data/test/test_itamae-mitsurin/handler/test_base.rb

@@ -0,0 +1,40 @@
+require 'socket'
+
+module ItamaeMitsurin
+  module Handler
+    class Base
+      attr_reader :recipes, :resources, :actions
+
+      def initialize(options)
+        @options = options
+
+        @recipes = []
+        @resources = []
+        @actions = []
+      end
+
+      def event(type, payload = {})
+        case type
+        when :recipe_started
+          @recipes << payload
+        when :recipe_completed, :recipe_failed
+          @recipes.pop
+        when :resource_started
+          @resources << payload
+        when :resource_completed, :resource_failed
+          @resources.pop
+        when :action_started
+          @actions << payload
+        when :action_completed, :action_failed
+          @actions.pop
+        end
+      end
+
+      private
+
+      def hostname
+        @hostname ||= @options['hostname'] || Socket.gethostname
+      end
+    end
+  end
+end

data/test/test_itamae-mitsurin/handler/test_debug.rb

@@ -0,0 +1,10 @@
+module ItamaeMitsurin
+  module Handler
+    class Debug < Base
+      def event(type, payload = {})
+        super
+        ItamaeMitsurin.logger.info("EVENT:#{type} #{payload}")
+      end
+    end
+  end
+end

data/test/test_itamae-mitsurin/handler/test_fluentd.rb

@@ -0,0 +1,44 @@
+module ItamaeMitsurin
+  module Handler
+    class Fluentd < Base
+      attr_accessor :fluent_logger # for test
+
+      def initialize(*)
+        super
+        load_fluent_logger
+      end
+
+      def event(type, payload = {})
+        super
+
+        unless @fluent_logger.post(type, payload.merge(hostname: hostname))
+          ItamaeMitsurin.logger.warn "Sending logs to Fluentd failed: #{@fluent_logger.last_error}"
+        end
+      end
+
+      private
+
+      def load_fluent_logger
+        begin
+          require 'fluent-logger'
+        rescue LoadError
+          raise "Loading fluent-logger gem failed. Please install 'fluent-logger' gem to use fluentd handler."
+        end
+
+        @fluent_logger = Fluent::Logger::FluentLogger.new(tag_prefix, host: fluentd_host, port: fluentd_port)
+      end
+
+      def tag_prefix
+        @options['tag_prefix'] || 'itamae_server'
+      end
+
+      def fluentd_host
+        @options['host'] || 'localhost'
+      end
+
+      def fluentd_port
+        (@options['port'] || 24224).to_i
+      end
+    end
+  end
+end

data/test/test_itamae-mitsurin/handler/test_json.rb

@@ -0,0 +1,22 @@
+module ItamaeMitsurin
+  module Handler
+    class Json < Base
+      def initialize(*)
+        super
+        require 'time'
+        open_file
+      end
+
+      def event(type, payload = {})
+        super
+        @f.puts({'time' => Time.now.iso8601, 'event' => type, 'payload' => payload}.to_json)
+      end
+
+      private
+
+      def open_file
+        @f = open(@options.fetch('path'), 'a')
+      end
+    end
+  end
+end

data/test/test_itamae-mitsurin/mitsurin/creators/templates/project/.rspec

@@ -0,0 +1,2 @@
+--color
+-fd

data/test/test_itamae-mitsurin/mitsurin/creators/templates/project/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'itamae-mitsurin'

data/test/test_itamae-mitsurin/mitsurin/creators/templates/project/environments/sample.json

@@ -0,0 +1,7 @@
+{
+  "environments": {
+    "ssh_port": "22",
+    "ssh_user": "ec2-user",
+    "ssh_key":  "keipair.pem"
+  }
+}