itamae-mitsurin 0.4 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb10fdaf74906a17da6f88364c2fd758f20d35ab
-  data.tar.gz: e0a64acfc4099cc9a7bc4f35ab612abefe7d4cb4
+  metadata.gz: e4a13a13168741e95c8e8adc93ab308a34a45892
+  data.tar.gz: 47410d5b59390fc5aeb0b95801b7ac12979c3da5
 SHA512:
-  metadata.gz: 1aa4b406d867b1fc844bcdba2f096eb2decb1065f7c257f9da8522652ac39e37ef4c1fae1966a0536308ee3721a1b8cbc72614b2f1d0565e0ff952d0058790f4
-  data.tar.gz: 4454340317f8a0e1a905c7b3e3778a17909b06f1a60df20cc1dff3eadd4036d6f3f5d3464168098c5ae67636c9a7d365a6b3f2ea4cc07fcd7526dda4fd78acf9
+  metadata.gz: 1241689feb0f512bb31deea4e8263d94b485cff966d382045f2d5e731a15af1780e9396638e8c042fb9ca2778287d1eca5c9d3d4a7bfe6032d9bb24b6304ae0b
+  data.tar.gz: 29684144ddebcab7d461745a26e286a5d7fa97807008d7a7cd31864939f8c5ed500f4fab4ab938c8362ce77a2f381cad830e2645f49fb25d424dd117eb8d3c57

data/LICENSE.txt

@@ -1,6 +1,6 @@
 Copyright (c) 2016 Akihiro Kamiyama
 
-Ripped out of Itamae 1.9.3, Itamae-plugin-resource-aws 0.1 and modified.
+Ripped out of Itamae, Itamae-plugin-resource-aws 0.1 and modified.
 Copyright (c) 2013-2015 Ryota Arai
 Copyright (c) 2015 Gosuke Miyashita
 

data/README.md

@@ -7,6 +7,7 @@ Customized version of Itamae and plugin
 - Like more Chef
 - Little attributes
 - Support AWS Resource
+- Running on the RakeTask
 
 ## Installation
 
@@ -14,7 +15,7 @@ Customized version of Itamae and plugin
 $ gem install itamae-mitsurin
 $ mkdir project_dir
 $ cd project_dir
-$ itamae-mitsurin init
+$ manaita init
 ```
 
 ## Usage AWS Resource

data/Rakefile

@@ -11,23 +11,25 @@ rescue LoadError
   puts 'If you want to create gem, You must install Bundler'
 end
 
-require './lib/itamae/mitsurin/version.rb'
+require './lib/itamae-mitsurin/version.rb'
 def version
-  Itamae::Mitsurin::VERSION
+  ItamaeMitsurin::VERSION
 end
 
-task :default => :test
-task :test => :compile
-Rake::TestTask.new do |t|
-  t.libs << 'lib' << 'test'
-  t.test_files = FileList['test/test_*.rb'].exclude('test/test_assoccoords.rb')
-end
-
-Rake::ExtensionTask.new do |ext|
-  ext.name = 'itamae-mitsurin'
-  ext.ext_dir = 'ext/'
-  ext.lib_dir = 'lib/'
-end
+#task :default => :test
+#task :test => :compile
+Rake::TestTask.new
+#Rake::TestTask.new do |t|
+#  t.libs << 'lib' << 'test'
+#  t.libs << 'test'
+#  t.test_files = FileList['test/test*.rb'].exclude('test/test_assoccoords.rb')
+#end
+
+#Rake::ExtensionTask.new do |ext|
+#  ext.name = 'itamae-mitsurin'
+#  ext.ext_dir = 'ext/'
+#  ext.lib_dir = 'lib/'
+#end
 
 Rake::PackageTask.new('itamae-mitsurin', "#{version}") do |t|
   t.need_tar_gz = true
@@ -37,7 +39,7 @@ end
 namespace :release do
   desc "Bump up version and commit"
   task :version_up do
-    version_file = File.expand_path("lib/itamae/mitsurin/version.txt")
+    version_file = File.expand_path("lib/itamae-mitsurin/version.txt")
     current_version = File.read(version_file).strip
 
     if /\A(.+?)(\d+)\z/ =~ current_version

data/bin/itamae

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
 
-require 'itamae/cli'
-Itamae::CLI.start
-
+require 'itamae-mitsurin/cli'
+ItamaeMitsurin::CLI.start

data/bin/manaita

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'itamae-mitsurin/mitsurin/cli'
+ItamaeMitsurin::Mitsurin::CLI.start
+

data/itamae-mitsurin.gemspec

@@ -1,11 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'itamae/mitsurin/version'
+require 'itamae-mitsurin/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "itamae-mitsurin"
-  spec.version       = Itamae::Mitsurin::VERSION
+  spec.version       = ItamaeMitsurin::VERSION
   spec.authors       = ["Akihiro Kamiyama"]
   spec.email         = ["akihiro.vamps@gmail.com"]
   spec.summary       = %q{Customized version of Itamae and Itamae plugin}
@@ -18,15 +18,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "thor"
-  spec.add_runtime_dependency "specinfra", [">= 2.51.2", "< 3.0.0"]
   spec.add_runtime_dependency "hashie"
   spec.add_runtime_dependency "ansi"
   spec.add_runtime_dependency "schash", "~> 0.1.0"
   spec.add_runtime_dependency "aws-sdk", "~> 2"
   spec.add_runtime_dependency "serverspec", [">= 2.30", "< 3.0.0"]
-  spec.add_runtime_dependency "rake"
+  spec.add_runtime_dependency "highline"
 
   spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "rake-compiler"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "docker-api", "~> 1.20"

data/lib/itamae-mitsurin.rb

@@ -0,0 +1,17 @@
+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 ItamaeMitsurin
+  # Your code goes here...
+end

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

@@ -22,7 +22,7 @@ module Specinfra
   end
 end
 
-module Itamae
+module ItamaeMitsurin
   module Backend
     UnknownBackendTypeError = Class.new(StandardError)
     CommandExecutionError = Class.new(StandardError)
@@ -47,11 +47,11 @@ module Itamae
         options = {error: true}.merge(options)
 
         command = build_command(commands, options)
-        Itamae.logger.debug "Executing `#{command}`..."
+        ItamaeMitsurin.logger.debug "Executing `#{command}`..."
 
         result = nil
 
-        Itamae.logger.with_indent do
+        ItamaeMitsurin.logger.with_indent do
           reset_output_handler
 
           result = run_command_with_profiling(command)
@@ -65,7 +65,7 @@ module Itamae
             method = :error
             message = "Command `#{command}` failed. (exit status: #{result.exit_status})"
 
-            unless Itamae.logger.level == ::Logger::DEBUG
+            unless ItamaeMitsurin.logger.level == ::Logger::DEBUG
               result.stdout.each_line do |l|
                 log_output_line("stdout", l, :error)
               end
@@ -75,7 +75,7 @@ module Itamae
             end
           end
 
-          Itamae.logger.public_send(method, message)
+          ItamaeMitsurin.logger.public_send(method, message)
         end
 
         if options[:error] && result.exit_status != 0
@@ -91,15 +91,15 @@ module Itamae
 
       def receive_file(src, dst = nil)
         if dst
-          Itamae.logger.debug "Receiving a file from '#{src}' to '#{dst}'..."
+          ItamaeMitsurin.logger.debug "Receiving a file from '#{src}' to '#{dst}'..."
         else
-          Itamae.logger.debug "Receiving a file from '#{src}'..."
+          ItamaeMitsurin.logger.debug "Receiving a file from '#{src}'..."
         end
         @backend.receive_file(src, dst)
       end
 
       def send_file(src, dst)
-        Itamae.logger.debug "Sending a file from '#{src}' to '#{dst}'..."
+        ItamaeMitsurin.logger.debug "Sending a file from '#{src}' to '#{dst}'..."
         unless ::File.exist?(src)
           raise SourceNotExistError, "The file '#{src}' doesn't exist."
         end
@@ -110,7 +110,7 @@ module Itamae
       end
 
       def send_directory(src, dst)
-        Itamae.logger.debug "Sending a directory from '#{src}' to '#{dst}'..."
+        ItamaeMitsurin.logger.debug "Sending a directory from '#{src}' to '#{dst}'..."
         unless ::File.exist?(src)
           raise SourceNotExistError, "The directory '#{src}' doesn't exist."
         end
@@ -162,7 +162,7 @@ module Itamae
 
       def log_output_line(output_name, line, severity = :debug)
         line = line.gsub(/[[:cntrl:]]/, '')
-        Itamae.logger.public_send(severity, "#{output_name} | #{line}")
+        ItamaeMitsurin.logger.public_send(severity, "#{output_name} | #{line}")
       end
 
       def build_command(commands, options)
@@ -271,7 +271,7 @@ module Itamae
     class Docker < Base
       def finalize
         image = @backend.commit_container
-        Itamae.logger.info "Image created: #{image.id}"
+        ItamaeMitsurin.logger.info "Image created: #{image.id}"
       end
 
       private
@@ -279,12 +279,12 @@ module Itamae
         begin
           require 'docker'
         rescue LoadError
-          Itamae.logger.fatal "To use docker backend, please install 'docker-api' gem"
+          ItamaeMitsurin.logger.fatal "To use docker backend, please install 'docker-api' gem"
         end
 
         # TODO: Move to Specinfra?
         Excon.defaults[:ssl_verify_peer] = @options[:tls_verify_peer]
-        ::Docker.logger = Itamae.logger
+        ::Docker.logger = ItamaeMitsurin.logger
 
         Specinfra::Backend::Docker.new(
           docker_image: @options[:image],

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

@@ -1,7 +1,7 @@
-require 'itamae'
+require 'itamae-mitsurin'
 require 'thor'
 
-module Itamae
+module ItamaeMitsurin
   class CLI < Thor
 
     class_option :log_level, type: :string, aliases: ['-l'], default: 'info'
@@ -11,8 +11,8 @@ module Itamae
     def initialize(*)
       super
 
-      Itamae.logger.level = ::Logger.const_get(options[:log_level].upcase)
-      Itamae.logger.formatter.colored = options[:color]
+      ItamaeMitsurin.logger.level = ::Logger.const_get(options[:log_level].upcase)
+      ItamaeMitsurin.logger.formatter.colored = options[:color]
     end
 
     def self.define_exec_options
@@ -71,7 +71,7 @@ module Itamae
 
     desc "version", "Print version"
     def version
-      puts "Itamae-Mitsurin v#{Itamae::Mitsurin::VERSION}"
+      puts "itamae-mitsurin v#{ItamaeMitsurin::VERSION}"
     end
 
     private

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

@@ -1,6 +1,6 @@
-require 'itamae'
+require 'itamae-mitsurin'
 
-module Itamae
+module ItamaeMitsurin
   class Definition < Resource::Base
     class << self
       attr_accessor :definition_block

data/lib/itamae-mitsurin/ext.rb

@@ -0,0 +1 @@
+require 'itamae-mitsurin/ext/specinfra'

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

@@ -1,6 +1,6 @@
-require 'itamae/handler/base'
+require 'itamae-mitsurin/handler/base'
 
-module Itamae
+module ItamaeMitsurin
   module Handler
     def self.from_type(type)
       first_time = true
@@ -8,7 +8,7 @@ module Itamae
       class_name = type.split('_').map(&:capitalize).join
       self.const_get(class_name)
     rescue NameError
-      require "itamae/handler/#{type}"
+      require "itamae-mitsurin/handler/#{type}"
 
       if first_time
         first_time = false

data/lib/{itamae → itamae-mitsurin}/handler/base.rb

@@ -1,6 +1,6 @@
 require 'socket'
 
-module Itamae
+module ItamaeMitsurin
   module Handler
     class Base
       attr_reader :recipes, :resources, :actions

data/lib/{itamae → itamae-mitsurin}/handler/debug.rb

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

data/lib/{itamae → itamae-mitsurin}/handler/fluentd.rb

@@ -1,4 +1,4 @@
-module Itamae
+module ItamaeMitsurin
   module Handler
     class Fluentd < Base
       attr_accessor :fluent_logger # for test
@@ -12,7 +12,7 @@ module Itamae
         super
 
         unless @fluent_logger.post(type, payload.merge(hostname: hostname))
-          Itamae.logger.warn "Sending logs to Fluentd failed: #{@fluent_logger.last_error}"
+          ItamaeMitsurin.logger.warn "Sending logs to Fluentd failed: #{@fluent_logger.last_error}"
         end
       end
 

data/lib/{itamae → itamae-mitsurin}/handler/json.rb

@@ -1,4 +1,4 @@
-module Itamae
+module ItamaeMitsurin
   module Handler
     class Json < Base
       def initialize(*)

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

@@ -1,4 +1,4 @@
-module Itamae
+module ItamaeMitsurin
   class HandlerProxy
     def initialize
       @instances = []

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

@@ -1,8 +1,8 @@
-require 'itamae'
+require 'itamae-mitsurin'
 require 'logger'
 require 'ansi/code'
 
-module Itamae
+module ItamaeMitsurin
   module Logger
     module Helper
       def with_indent
@@ -109,8 +109,8 @@ module Itamae
   end
 
   @logger = ::Logger.new($stdout).tap do |l|
-    l.formatter = Itamae::Logger::Formatter.new
-  end.extend(Itamae::Logger::Helper)
+    l.formatter = ItamaeMitsurin::Logger::Formatter.new
+  end.extend(ItamaeMitsurin::Logger::Helper)
 
   class << self
     def logger
@@ -118,7 +118,7 @@ module Itamae
     end
 
     def logger=(l)
-      @logger = l.extend(Itamae::Logger::Helper)
+      @logger = l.extend(ItamaeMitsurin::Logger::Helper)
     end
   end
 end

data/lib/itamae-mitsurin/mitsurin.rb

@@ -0,0 +1,14 @@
+require 'itamae-mitsurin/version'
+require 'itamae-mitsurin/mitsurin/cli'
+require 'itamae-mitsurin/mitsurin/creators'
+require 'aws-sdk'
+#require 'itamae-mitsurin/mitsurin/itamae_task'
+#require 'itamae-mitsurin/mitsurin/serverspec_task'
+#require 'itamae-mitsurin/mitsurin/itamae_with_git_task'
+
+
+module ItamaeMitsurin
+  module Mitsurin
+  # TODO
+  end
+end

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

@@ -1,8 +1,8 @@
-require 'itamae'
-require 'itamae/mitsurin'
+require 'itamae-mitsurin'
+require 'itamae-mitsurin/mitsurin'
 require 'thor'
 
-module Itamae
+module ItamaeMitsurin
   module Mitsurin
     class CLI < Thor
       CREATE_TARGETS = %w[ cookbook ].freeze
@@ -11,7 +11,7 @@ module Itamae
 
       desc "version", "Print version"
       def version
-        puts "Itamae-Mitsurin v#{Itamae::Mitsurin::VERSION}"
+        puts "shikomi(itamae-mitsurin) v#{ItamaeMitsurin::VERSION}"
       end
 
       desc "init", "Create a new project"
@@ -46,7 +46,7 @@ module Itamae
       private
       def validate_create_target!(command, target)
         unless CREATE_TARGETS.include?(target)
-          msg = %Q!ERROR: "itamae #{command}" was called with "#{target}" !
+          msg = %Q!ERROR: "shikomi #{command}" was called with "#{target}" !
           msg << "but expected to be in #{CREATE_TARGETS.inspect}"
           fail InvocationError, msg
         end