itamae 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c531f6aca9ae4e769d8f073077e47c722be40c5
-  data.tar.gz: 35844bba50ca0705a464208a49e521ff0525da0b
+  metadata.gz: bee2953f7e53e6c977a24568b6f1ef50b2209f40
+  data.tar.gz: 2b8e4200cbcbf4f2106185355e240ba2c9798863
 SHA512:
-  metadata.gz: 84bf522e5530b3b3f11901987098106e33f15674017d1d32eacbf6e2806b62036e7a4394c7c544e46cdfdcadac3082b2179e25f3c344890d2bbe7e805bde0fda
-  data.tar.gz: 7588acd8fb22db71c6a261bc47e09233535a24a0de9db260522980b85962b67085ba5394e6b496438c1b53e4c35e86b1952ba95c6ab9edc7e83a7656e78c930a
+  metadata.gz: 73481813d9a2e6d6ed1033e787dc8e0392a6b47c1e68de5df4af6b43e76b6bd0a67e9095c826aa51b9cd74e62cbb08767f41210f55ddfa8e088996f58c339963
+  data.tar.gz: a1627a795d970cbfb2eba039bb13a5d33141c5209a1a75d967b549937e1db0bba7b03199e02f5758d0326be534d1758ee7673a4516e3f652c12a34742c2623a8

data/README.md

@@ -2,6 +2,8 @@
 
 Simple and lightweight configuration management tool inspired by Chef.
 
+- [CHANGELOG](https://github.com/itamae-kitchen/itamae/blob/master/CHANGELOG.md)
+
 ## Concept
 
 - Chef-like DSL

data/Rakefile

@@ -84,8 +84,6 @@ namespace :release do
     end
     system "git add #{version_file}"
     system "git commit -m 'Bump up version'"
-
-    Rake::Task["release"].invoke
   end
 end
 

data/itamae.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "thor"
-  spec.add_runtime_dependency "specinfra", ">= 2.21.1"
+  spec.add_runtime_dependency "specinfra", [">= 2.24.1", "< 3.0.0"]
   spec.add_runtime_dependency "hashie"
   spec.add_runtime_dependency "ansi"
   spec.add_runtime_dependency "schash", "~> 0.1.0"

data/lib/itamae/backend.rb

@@ -25,20 +25,17 @@ module Itamae
     CommandExecutionError = Class.new(StandardError)
 
     class << self
-      def set_type(type, opts = {})
-        @instance = self.const_get(type.capitalize).new(opts)
-      end
-
-      def instance
-        unless @instance
-          raise "Before calling Backend.instance, call Backend.set_type."
-        end
-
-        @instance
+      def create(type, opts = {})
+        self.const_get(type.capitalize).new(opts)
       end
     end
 
     class Base
+      def initialize(options)
+        @options = options
+        @backend = create_specinfra_backend
+      end
+
       def run_command(commands, options = {})
         options = {error: true}.merge(options)
 
@@ -62,7 +59,7 @@ module Itamae
 
         Logger.debug "Executing `#{command}`..."
 
-        result = Specinfra::Runner.run_command(command)
+        result = @backend.run_command(command)
         exit_status = result.exit_status
 
         Logger.formatter.with_indent do
@@ -104,61 +101,100 @@ module Itamae
       end
 
       def get_command(*args)
-        Specinfra.command.get(*args)
+        @backend.command.get(*args)
       end
 
       def send_file(*args)
-        Specinfra::Runner.send_file(*args)
+        @backend.send_file(*args)
       end
 
       def send_directory(*args)
-        Specinfra::Runner.send_directory(*args)
+        @backend.send_directory(*args)
+      end
+
+      def host_inventory
+        @backend.host_inventory
       end
 
       def finalize
         # pass
       end
+
+      private
+
+      def create_specinfra_backend
+        raise NotImplementedError
+      end
     end
 
     # TODO: Make Specinfra's backends instanciatable 
     class Local < Base
-      def initialize(options)
-        Specinfra.configuration.backend = :exec
+      private
+      def create_specinfra_backend
+        Specinfra::Backend::Exec.new()
       end
     end
 
     class Ssh < Base
-      def initialize(options)
-        Specinfra.configuration.request_pty = true
-        Specinfra.configuration.host = options.delete(:host)
-        Specinfra.configuration.disable_sudo = options.delete(:disable_sudo)
-        Specinfra.configuration.ssh_options = options
+      private
+      def create_specinfra_backend
+        Specinfra::Backend::Ssh.new(
+          request_pty: true,
+          host: ssh_options[:host_name],
+          disable_sudo: ssh_options[:disable_sudo],
+          ssh_options: ssh_options,
+        )
+      end
+
+      def ssh_options
+        opts = {}
+
+        opts[:host_name] = @options[:host]
+        opts[:user] = @options[:user] || Etc.getlogin
+        opts[:keys] = [@options[:key]] if @options[:key]
+        opts[:port] = @options[:port] if @options[:port]
+        opts[:disable_sudo] = true unless @options[:sudo]
+
+        if @options[:vagrant]
+          config = Tempfile.new('', Dir.tmpdir)
+          hostname = opts[:host] || 'default'
+          `vagrant ssh-config #{hostname} > #{config.path}`
+          opts.merge!(Net::SSH::Config.for(hostname, [config.path]))
+          opts[:host] = opts.delete(:host_name)
+        end
+
+        if @options[:ask_password]
+          print "password: "
+          password = STDIN.noecho(&:gets).strip
+          print "\n"
+          opts.merge!(password: password)
+        end
 
-        Specinfra.configuration.backend = :ssh
+        opts
       end
     end
 
     class Docker < Base
-      def initialize(options)
+      private
+      def create_specinfra_backend
         begin
           require 'docker'
         rescue LoadError
           Logger.fatal "To use docker backend, please install 'docker-api' gem"
         end
 
-        Specinfra.configuration.docker_image = options[:image]
-        Specinfra.configuration.docker_container = options[:container]
-
         # TODO: Move to Specinfra?
-        Excon.defaults[:ssl_verify_peer] = options[:tls_verify_peer]
-
-        Specinfra.configuration.backend = :docker
-
+        Excon.defaults[:ssl_verify_peer] = @options[:tls_verify_peer]
         ::Docker.logger = Logger
+
+        Specinfra::Backend::Docker.new(
+          docker_image: @options[:image],
+          docker_container: @options[:container],
+        )
       end
 
       def finalize
-        image = Specinfra.backend.commit_container
+        image = @backend.commit_container
         Logger.info "Image created: #{image.id}"
       end
     end

data/lib/itamae/ext/specinfra.rb

@@ -1,10 +1,2 @@
 # TODO: Send patches to Specinfra
 
-Specinfra::Command::Base::User.class_eval do
-  class << self
-    def update_home_directory(user, directory)
-      # -m: Move the content of the user's home directory to the new location.
-      "usermod -m -d #{escape(directory)} #{escape(user)}"
-    end
-  end
-end

data/lib/itamae/node.rb

@@ -7,6 +7,11 @@ module Itamae
   class Node < Hashie::Mash
     ValidationError = Class.new(StandardError)
 
+    def initialize(initial_hash, backend = nil)
+      super(initial_hash)
+      @backend = backend
+    end
+
     def reverse_merge(other_hash)
       Hashie::Mash.new(other_hash).merge(self)
     end
@@ -19,7 +24,7 @@ module Itamae
       val = super(key)
       if val.nil?
         begin
-          val = host_inventory[key]
+          val = @backend.host_inventory[key]
         rescue NotImplementedError, NameError
           val = nil
         end

data/lib/itamae/resource/base.rb

@@ -277,7 +277,7 @@ module Itamae
       end
 
       def backend
-        Backend.instance
+        runner.backend
       end
 
       def runner

data/lib/itamae/runner.rb

@@ -8,9 +8,8 @@ module Itamae
       def run(recipe_files, backend_type, options)
         Logger.info "Starting Itamae..."
 
-        set_backend_from_options(backend_type, options)
-
-        runner = self.new(node_from_options(options))
+        backend = Backend.create(backend_type, options)
+        runner = self.new(backend, options)
         runner.load_recipes(recipe_files)
 
         if dot_file = options[:dot]
@@ -23,81 +22,23 @@ module Itamae
 
         runner.run(dry_run: options[:dry_run])
       end
-
-      private
-      def node_from_options(options)
-        hash = {}
-
-        if options[:ohai]
-          unless Backend.instance.run_command("which ohai", error: false).exit_status == 0
-            # install Ohai
-            Logger.info "Installing Chef package... (to use Ohai)"
-            Backend.instance.run_command("curl -L https://www.opscode.com/chef/install.sh | bash")
-          end
-
-          Logger.info "Loading node data via ohai..."
-          hash.merge!(JSON.parse(Backend.instance.run_command("ohai").stdout))
-        end
-
-        if options[:node_json]
-          path = File.expand_path(options[:node_json])
-          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])
-          Logger.info "Loading node data from #{path}..."
-          hash.merge!(YAML.load(open(path)))
-        end
-
-        Node.new(hash)
-      end
-
-      def set_backend_from_options(type, options)
-        opts = {}
-
-        case type
-        when :ssh
-          opts[:host] = options[:host]
-          opts[:user] = options[:user] || Etc.getlogin
-          opts[:keys] = [options[:key]] if options[:key]
-          opts[:port] = options[:port] if options[:port]
-          opts[:disable_sudo] = true unless options[:sudo]
-
-          if options[:vagrant]
-            config = Tempfile.new('', Dir.tmpdir)
-            hostname = opts[:host] || 'default'
-            `vagrant ssh-config #{hostname} > #{config.path}`
-            opts.merge!(Net::SSH::Config.for(hostname, [config.path]))
-            opts[:host] = opts.delete(:host_name)
-          end
-
-          if options[:ask_password]
-            print "password: "
-            password = STDIN.noecho(&:gets).strip
-            print "\n"
-            opts.merge!(password: password)
-          end
-        when :docker
-          opts = options
-        end
-
-        Backend.set_type(type, opts)
-      end
     end
 
-    attr_accessor :node
-    attr_accessor :tmpdir
-    attr_accessor :children
+    attr_reader :backend
+    attr_reader :node
+    attr_reader :tmpdir
+    attr_reader :children
+
+    def initialize(backend, options)
+      @backend = backend
+      @options = options
 
-    def initialize(node)
-      @node = node
+      @node = create_node
       @tmpdir = "/tmp/itamae_tmp"
       @children = RecipeChildren.new
 
-      Backend.instance.run_command(["mkdir", "-p", @tmpdir])
-      Backend.instance.run_command(["chmod", "777", @tmpdir])
+      @backend.run_command(["mkdir", "-p", @tmpdir])
+      @backend.run_command(["chmod", "777", @tmpdir])
     end
 
     def load_recipes(paths)
@@ -110,7 +51,37 @@ module Itamae
 
     def run(options)
       children.run(options)
-      Backend.instance.finalize
+      @backend.finalize
+    end
+
+    private
+    def create_node
+      hash = {}
+
+      if @options[:ohai]
+        unless @backend.run_command("which ohai", error: false).exit_status == 0
+          # install Ohai
+          Logger.info "Installing Chef package... (to use Ohai)"
+          @backend.run_command("curl -L https://www.opscode.com/chef/install.sh | bash")
+        end
+
+        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])
+        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])
+        Logger.info "Loading node data from #{path}..."
+        hash.merge!(YAML.load(open(path)))
+      end
+
+      Node.new(hash, @backend)
     end
   end
 end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.2.0
+1.2.2

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

@@ -2,10 +2,11 @@ require 'spec_helper'
 
 module Itamae
   describe Node do
+    let(:backend) { nil }
     describe "#reverse_merge" do
       it "merges a hash but the method receiver's value will be preferred" do
-        a = described_class.new(a: :b, c: :d)
-        expected = described_class.new(a: :b, c: :d, e: :f)
+        a = described_class.new({a: :b, c: :d}, backend)
+        expected = described_class.new({a: :b, c: :d, e: :f}, backend)
         expect(a.reverse_merge(a: :c, e: :f)).to eq(expected)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.21.1
+        version: 2.24.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.21.1
+        version: 2.24.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -254,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple Configuration Management Tool