knife-hitori 0.0.1 → 0.0.2

data/lib/chef/knife/hitori/run_list_options.rb

@@ -0,0 +1,22 @@
+# coding: utf-8
+
+require 'chef/knife'
+
+class Chef
+  class Knife
+    module RunListOptions
+      def self.included(receiver)
+        receiver.class_eval do
+          option :roles,
+                 :short => '-R ROLE1[,ROLE2]',
+                 :long  => '--roles ROLE1[,ROLE2]',
+                 :description => 'override run_list by roles'
+
+          option :recipes,
+                 :long => '--recipes RECIPE1[,RECIPE2]',
+                 :description => 'override run_list by recipes'
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/hitori/version.rb

@@ -1,7 +1,7 @@
 class Chef
   class Knife
     class Hitori
-      VERSION = '0.0.1'
+      VERSION = '0.0.2'
     end
   end
 end

data/lib/chef/knife/hitori_bootstrap.rb

@@ -0,0 +1,34 @@
+# coding: utf-8
+
+require 'chef/knife/hitori_base'
+require 'chef/knife/hitori_prepare'
+require 'chef/knife/hitori_cook'
+require 'chef/knife/hitori/run_list_options'
+
+
+class Chef
+  class Knife
+    class HitoriBootstrap < Knife
+      banner 'knife hitori bootstrap (options)'
+      include HitoriBase
+      include RunListOptions
+
+      def load_deps
+        Chef::Knife::HitoriPrepare.load_deps
+        Chef::Knife::HitoriCook.load_deps
+        super
+      end
+
+      def run
+        hitori_prepare = Chef::Knife::HitoriPrepare.new
+        hitori_prepare.config = config.dup
+        hitori_prepare.run
+
+        hitori_cook = Chef::Knife::HitoriCook.new
+        hitori_cook.config = config.dup
+        hitori_cook.run_remote([hitori_prepare.server])
+      end
+    end
+  end
+end
+

data/lib/chef/knife/hitori_config.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 require 'chef/knife/hitori_base'
-require 'knife-hitori/interactive_configure'
+require 'knife-hitori/lib/interactive_configure'
 
 class Chef
   class Knife

data/lib/chef/knife/hitori_cook.rb

@@ -3,17 +3,17 @@
 require 'chef/knife/hitori_base'
 require 'set'
 
+require 'knife-hitori/lib/run_remote_cook'
+require 'chef/knife/hitori/run_list_options'
+
 class Chef
   class Knife
     class HitoriCook < Knife
-
       banner 'knife hitori cook (options)'
-
       include HitoriBase
+      include RunListOptions
 
       deps do
-        require 'net/ssh'
-        require 'net/scp'
         require 'fog'
       end
 
@@ -21,15 +21,6 @@ class Chef
              :long => '--local',
              :description => 'run chef-solo locally'
 
-      option :roles,
-             :short => '-R ROLE1[,ROLE2]',
-             :long  => '--roles ROLE1[,ROLE2]',
-             :description => 'override run_list by roles'
-
-      option :recipes,
-             :long => '--recipes RECIPE1[,RECIPE2]',
-             :description => 'override run_list by recipes'
-
       option :install_chef,
              :long => '--install-chef',
              :description => 'Install chef before run cookbook. This process usually have done by hitori-prepare.'
@@ -81,6 +72,8 @@ class Chef
         end
       end
 
+
+      # @return [Hash]
       def json_attrs
         attrs = load_settings || {}
         # Chef::Mixin::DeepMerge.merge(normal_attrs,normal_attrs_to_merge)
@@ -112,20 +105,23 @@ class Chef
 
 
       #########################################################
-      ## 盛大なコピペ
       ########################################################
-      def run_remote
-        servers = find_ec2_servers
-        unless servers && !servers.empty?
-          ui.warn ui.color('no server found', :red)
-          return
+      def run_remote(server_list=nil)
+        if server_list
+          servers = server_list
+        else
+          servers = find_ec2_servers
+          unless servers && !servers.empty?
+            ui.warn ui.color('no server found', :red)
+            return
+          end
         end
 
         run_list = new_run_list
         threads = []
         servers.each_with_index do |server, idx|
           threads << Thread.new {
-            RunRemoteCook.new(Chef::Config, config, server, :idx => idx, :ui => ui, :run_list => run_list).run
+            KnifeHitori::RunRemoteCook.new(Chef::Config, config, server, :idx => idx, :ui => ui, :run_list => run_list).run
           }
         end
         threads.each do |t|
@@ -171,121 +167,5 @@ class Chef
         connection.servers.all.to_a
       end
     end
-
-    #############################################
-    class RunRemoteCook
-      attr_reader :config, :run_config, :server, :opts, :ui, :knife
-      def initialize(chef_config, run_config, server, opts)
-        @config = chef_config
-        @run_config = run_config
-        @server = server
-        @opts = opts
-        @ui = opts[:ui]
-        @knife = config.knife
-      end
-
-      def run
-        # Install Chef if needed
-        install_chef if run_config[:install_chef]
-
-        # Remove Old Cookbooks
-        console_log "Remove Old Chef Cookbooks in #{server.public_ip_address}\n"
-        mkdir_cmd = <<-EOS
-          [ -e #{knife[:remote_chef_dir]} ] && sudo rm -rf #{knife[:remote_chef_dir]}
-          sudo mkdir -p #{knife[:remote_chef_dir]}
-          sudo chmod 777 #{knife[:remote_chef_dir]}
-        EOS
-        exec_remote(mkdir_cmd)
-        # Upload Cookbooks
-        console_log "Uploading Chef Cookbooks to #{server.public_ip_address}\n"
-        remote_dir = "#{knife[:remote_chef_dir]}/#{File.basename(config[:chef_solo_base_dir])}"
-        chef_solo_filename = 'do_cook.sh'
-        files_info = []
-        files_info << {src: config[:chef_solo_base_dir], dest: knife[:remote_chef_dir], opts: {:recursive => true, :verbose => true}}
-        files_info << {src: KnifeHitori::resource(chef_solo_filename), dest: remote_dir, opts: {:verbose => true}}
-        upload_files(files_info)
-        console_log "Upload is done #{server.public_ip_address}\n"
-        # run chef-solo
-        script = <<-EOS
-          cd #{remote_dir}
-          tr -d '\\r' < #{chef_solo_filename} > .a
-          mv .a #{chef_solo_filename}
-          #{make_run_list_cmd}
-          sudo CHEF_ENV=#{config[:solo_environment]} sh #{chef_solo_filename}
-        EOS
-        exec_remote(script)
-      end
-
-      def install_chef
-        Chef::Log.debug 'install_chef'
-        console_log "Install Chef in #{server.public_ip_address}\n"
-        remote_filename = '/tmp/.install_chef_script'
-        upload_files([{src: knife[:template_file], dest: remote_filename, opts: {:verbose => true}}])
-        exec_remote("sudo sh #{remote_filename}; rm #{remote_filename}")
-      end
-
-      def make_run_list_cmd
-        script = ''
-        if opts[:run_list] && !opts[:run_list].empty?
-          script = <<-EOS
-            [ -d run_list/#{config[:solo_environment]} ] || mkdir -p run_list/#{config[:solo_environment]}
-            echo '#{opts[:run_list].join(',')}' > run_list/#{config[:solo_environment]}/`hostname`
-          EOS
-        end
-        script
-      end
-
-      #######################
-      def bg_color(text)
-        #Background colors
-        #40	Black
-        #41	Red
-        #42	Green
-        #43	Yellow
-        #44	Blue
-        #45	Magenta
-        #46	Cyan
-        #47	White
-        c = 47 - ((opts[:idx].to_i + 3) % 7)
-        "\e[#{c}m#{text}\e[0m"
-      end
-
-      def upload_files(files_info)
-        Net::SCP.start(server.public_ip_address, knife[:ssh_user], :keys => [knife[:identity_file]], :compression => true) do |scp|
-          channels = []
-          files_info.each do |info|
-            channels << scp.upload(info[:src], info[:dest], info[:opts])
-          end
-          channels.each do |ch|
-            ch.wait
-          end
-        end
-      end
-
-      def exec_remote(command)
-        Net::SSH.start(server.public_ip_address, knife[:ssh_user], :keys => [knife[:identity_file]]) do |ssh|
-          ssh.open_channel do |ch|
-            ch.request_pty do |pty, success|
-              raise 'Could not obtain pty' unless success
-            end
-            ch.exec(command) do |c, success|
-              abort 'could not execute command' unless success
-              ch.on_data do |c, data|
-                console_log data
-              end
-
-              ch.on_extended_data do |c, type, data|
-                console_log data
-              end
-            end
-          end
-        end
-      end
-
-      def console_log(msg)
-        print bg_color(msg)
-      end
-    end
-
   end
 end

data/lib/chef/knife/hitori_data_bag_dec.rb

@@ -0,0 +1,48 @@
+# coding: utf-8
+
+require 'chef/knife/hitori_base'
+
+class Chef
+  class Knife
+    class HitoriDataBagDec < Knife
+      banner 'knife hitori data bag dec BAG ITEM (options)'
+      include HitoriBase
+
+      option :secret_file,
+             :long => '--secret-file SECRET_FILE',
+             :description => 'A file containing the secret key to use to encrypt data bag item values'
+
+      def run
+        config[:bag], config[:item] = @name_args
+        exit 1 unless validate
+
+        decrypt_data_bag
+      end
+
+      def decrypt_data_bag
+        secret = Chef::EncryptedDataBagItem.load_secret(secret_file_path)
+        spr_creds = Chef::EncryptedDataBagItem.load(config[:bag], config[:item], secret)
+        puts JSON.pretty_generate(spr_creds.to_hash)
+      end
+
+      def secret_file_path
+        config[:secret_file] || Chef::Config[:encrypted_data_bag_secret]
+      end
+
+      def validate
+        if config[:bag].nil? || config[:item].nil?
+          ui.error('Please specify BAG and ITEM')
+          return false
+        end
+
+        unless secret_file_path
+          ui.error('Please specify EncryptKey by Chef Config "encrypted_data_bag_secret" or --secret-file')
+          return false
+        end
+
+        return true
+      end
+    end
+  end
+end
+

data/lib/chef/knife/hitori_data_bag_enc.rb

@@ -0,0 +1,63 @@
+# coding: utf-8
+
+require 'chef/knife/hitori_base'
+
+class Chef
+  class Knife
+    class HitoriDataBagEnc < Knife
+      banner 'knife hitori data bag enc BAG ITEM (options)'
+      include HitoriBase
+
+      option :json_file,
+             :short => '-j JSON_FILE',
+             :description => 'A json file for encryption'
+
+      option :secret_file,
+             :long => '--secret-file SECRET_FILE',
+             :description => 'A file containing the secret key to use to encrypt data bag item values'
+
+      def run
+        config[:bag], config[:item] = @name_args
+        exit 1 unless validate
+
+        create_data_bag
+      end
+
+      def create_data_bag
+        data_bag_path = Chef::Config[:data_bag_path]
+        secret = Chef::EncryptedDataBagItem.load_secret(secret_file_path)
+        data = JSON.parse(File.read(config[:json_file]))
+        encrypted_data = Chef::EncryptedDataBagItem.encrypt_data_bag_item(data, secret)
+        bag_dir = "#{data_bag_path}/#{config[:bag]}"
+        FileUtils.mkpath(bag_dir)
+        write_path = "#{bag_dir}/#{config[:item]}.json"
+        File.write(write_path, encrypted_data.to_json)
+        ui.info ui.color("Created encrypted data bag item at #{write_path}", :green)
+      end
+
+      def secret_file_path
+        config[:secret_file] || Chef::Config[:encrypted_data_bag_secret]
+      end
+
+      def validate
+        if config[:bag].nil? || config[:item].nil?
+          ui.error('Please specify BAG and ITEM')
+          return false
+        end
+
+        if config[:json_file].nil?
+          ui.error('You have not provided a json file for encryption')
+          return false
+        end
+
+        unless secret_file_path
+          ui.error('Please specify EncryptKey by Chef Config "encrypted_data_bag_secret" or --secret-file')
+          return false
+        end
+
+        return true
+      end
+    end
+  end
+end
+

data/lib/chef/knife/hitori_hello.rb

@@ -15,6 +15,7 @@ class Chef
 
       def run
         puts 'Hello Knife::Hitori.'
+        p @name_args
         p Chef::Config
         puts '-' * 50
         p config

data/lib/chef/knife/hitori_prepare.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 require 'chef/knife/hitori_base'
-require 'knife-hitori/interactive_configure'
+require 'knife-hitori/lib/interactive_configure'
 
 class Chef
   class Knife

data/lib/knife-hitori/lib/run_remote_cook.rb

@@ -0,0 +1,121 @@
+# coding: utf-8
+
+require 'net/ssh'
+require 'net/scp'
+
+module KnifeHitori
+  class RunRemoteCook
+    attr_reader :config, :run_config, :server, :opts, :ui, :knife
+
+    def initialize(chef_config, run_config, server, opts)
+      @config = chef_config
+      @run_config = run_config
+      @server = server
+      @opts = opts
+      @ui = opts[:ui]
+      @knife = config.knife
+    end
+
+    def run
+      # Install Chef if needed
+      install_chef if run_config[:install_chef]
+
+      # Remove Old Cookbooks
+      console_log "Remove Old Chef Cookbooks in #{server.public_ip_address}\n"
+      mkdir_cmd = <<-EOS
+          [ -e #{knife[:remote_chef_dir]} ] && sudo rm -rf #{knife[:remote_chef_dir]}
+          sudo mkdir -p #{knife[:remote_chef_dir]}
+          sudo chmod 777 #{knife[:remote_chef_dir]}
+      EOS
+      exec_remote(mkdir_cmd)
+      # Upload Cookbooks
+      console_log "Uploading Chef Cookbooks to #{server.public_ip_address}\n"
+      remote_dir = "#{knife[:remote_chef_dir]}/#{::File.basename(config[:chef_solo_base_dir])}"
+      chef_solo_filename = 'do_cook.sh'
+      files_info = []
+      files_info << {src: config[:chef_solo_base_dir], dest: knife[:remote_chef_dir], opts: {:recursive => true, :verbose => true}}
+      files_info << {src: KnifeHitori::resource(chef_solo_filename), dest: remote_dir, opts: {:verbose => true}}
+      upload_files(files_info)
+      console_log "Upload is done #{server.public_ip_address}\n"
+      # run chef-solo
+      script = <<-EOS
+          cd #{remote_dir}
+          tr -d '\\r' < #{chef_solo_filename} > .a
+          mv .a #{chef_solo_filename}
+      #{make_run_list_cmd}
+          sudo CHEF_ENV=#{config[:solo_environment]} sh #{chef_solo_filename}
+      EOS
+      exec_remote(script)
+    end
+
+    def install_chef
+      Chef::Log.debug 'install_chef'
+      console_log "Install Chef in #{server.public_ip_address}\n"
+      remote_filename = '/tmp/.install_chef_script'
+      upload_files([{src: knife[:template_file], dest: remote_filename, opts: {:verbose => true}}])
+      exec_remote("sudo sh #{remote_filename}; rm #{remote_filename}")
+    end
+
+    def make_run_list_cmd
+      script = ''
+      if opts[:run_list] && !opts[:run_list].empty?
+        script = <<-EOS
+            [ -d run_list/#{config[:solo_environment]} ] || mkdir -p run_list/#{config[:solo_environment]}
+            echo '#{opts[:run_list].join(',')}' > run_list/#{config[:solo_environment]}/`hostname`
+        EOS
+      end
+      script
+    end
+
+    #######################
+    def bg_color(text)
+      #Background colors
+      #40	Black
+      #41	Red
+      #42	Green
+      #43	Yellow
+      #44	Blue
+      #45	Magenta
+      #46	Cyan
+      #47	White
+      c = 47 - ((opts[:idx].to_i + 3) % 7)
+      "\e[#{c}m#{text}\e[0m"
+    end
+
+    def upload_files(files_info)
+      Net::SCP.start(server.public_ip_address, knife[:ssh_user], :keys => [knife[:identity_file]], :compression => true) do |scp|
+        channels = []
+        files_info.each do |info|
+          channels << scp.upload(info[:src], info[:dest], info[:opts])
+        end
+        channels.each do |ch|
+          ch.wait
+        end
+      end
+    end
+
+    def exec_remote(command)
+      Net::SSH.start(server.public_ip_address, knife[:ssh_user], :keys => [knife[:identity_file]]) do |ssh|
+        ssh.open_channel do |ch|
+          ch.request_pty do |pty, success|
+            raise 'Could not obtain pty' unless success
+          end
+          ch.exec(command) do |c, success|
+            abort 'could not execute command' unless success
+            ch.on_data do |c, data|
+              console_log data
+            end
+
+            ch.on_extended_data do |c, type, data|
+              console_log data
+            end
+          end
+        end
+      end
+    end
+
+    def console_log(msg)
+      print bg_color(msg)
+    end
+  end
+end

data/spec/knife/hitori_bootstrap_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+require 'chef/knife/hitori_bootstrap'
+
+describe 'HitoriBootstrap' do
+  before do
+    @obj = Chef::Knife::HitoriBootstrap.new(%w(-R api))
+  end
+
+  describe :run do
+    it 'should call HitoriPrepare and HitoriCook' do
+      Chef::Knife::HitoriPrepare.any_instance.should_receive(:run).once
+      Chef::Knife::HitoriCook.any_instance.should_receive(:run_remote).once
+      @obj.run
+    end
+  end
+end

data/spec/knife/hitori_cook_spec.rb

@@ -5,6 +5,7 @@ require 'fileutils'
 require 'spec_helper'
 
 require 'chef/knife/hitori_cook'
+require 'chef/client'
 
 
 describe 'hitori_cook' do
@@ -28,9 +29,32 @@ describe 'hitori_cook' do
           template_file: 'my_template',
       }
     end
+
+    it 'should call run_local if config[:local]' do
+      @obj.should_receive(:run_local)
+      @obj.config[:local] = true
+      @obj.run
+    end
+
+    it 'should call run_remote if not config[:local]' do
+      @obj.should_receive(:run_remote)
+      @obj.config[:local] = nil
+      @obj.run
+    end
+  end
+
+  describe :run_local do
+    it 'should call ChefClient.run' do
+      @obj.config[:environment] = nil
+      chef_client = double('chef_client')
+      Chef::Client.should_receive(:new).with({json: 'attrs'}).and_return(chef_client)
+      @obj.stub(:json_attrs => {json: 'attrs'})
+      chef_client.should_receive(:run)
+      @obj.run_local
+    end
   end
 
-  describe :overwrite_environment do
+  describe :update_environment do
     before(:each) do
       Chef::Config[:data_bag_path_tpl] = 'databag/%s'
       Chef::Config[:settings_path_tpl] = 'settings/%s'
@@ -44,6 +68,27 @@ describe 'hitori_cook' do
     its(:encrypted_data_bag_secret) {should == 'enc/my_env'}
   end
 
+  describe :json_attrs do
+    before() do
+      @data = {'my' => 'data', 'run_list' => 'role[magic]'}
+      temp = Tempfile.open('hitori-')
+      Chef::Config[:settings_path] = temp.path
+      temp.write JSON.dump(@data)
+      temp.close
+    end
+
+    it 'should return json data of Config[:settings_path]' do
+      @obj.json_attrs.should == @data
+    end
+
+    it 'should update run_list if options is specified' do
+      @obj.config[:recipes] = 'cat'
+      @obj.config[:roles] = 'dog'
+      ret = @obj.json_attrs
+      ret['run_list'].sort.should == %w(recipe[cat] role[dog]).sort
+    end
+  end
+
   describe :new_run_list do
     before(:each) do
       @obj.config[:roles] = 'role1, role2'
@@ -57,11 +102,73 @@ describe 'hitori_cook' do
     it {should include('recipe[rcp2]')}
   end
 
-  describe :json_attrs do
-    it 'should update run_list' do
-      @obj.config[:roles] = 'my_role1'
-      attrs = @obj.json_attrs
-      attrs['run_list'].should include('role[my_role1]')
+  describe :run_remote do
+    before do
+      @obj.should_receive(:find_ec2_servers).and_return(%w(s1 s2))
+    end
+
+    it 'should call RunRemoteCook.run' do
+      rrc = double('RunRemoteCook')
+      KnifeHitori::RunRemoteCook.should_receive(:new).
+          with(Chef::Config, @obj.config, 's1', anything).
+          and_return(rrc)
+      KnifeHitori::RunRemoteCook.should_receive(:new).
+          with(Chef::Config, @obj.config, 's2', anything).
+          and_return(rrc)
+      rrc.should_receive(:run).twice
+      @obj.run_remote
     end
   end
+
+  describe :fetch_server_info do
+    before do
+      @s1, @s2, @s3 = %w(s1 s2 s3).map{|s|
+        x = double(s).as_null_object
+        x.stub_chain(:tags, :[])
+        x.stub_chain(:tags, :[]).with('Name').and_return(s)
+        x.stub_chain(:tags, :[]).with('my_tag').and_return('tag_' + s)
+        x.stub(:groups => [s])
+        x.stub(:public_ip_address => 'ip_'+s)
+        x
+      }
+      @obj.should_receive(:server_info_list).and_return([@s1, @s2, @s3])
+    end
+
+    it 'should return servers by tag' do
+      @obj.config[:tag] = 'my_tag=tag_s2'
+      ret = @obj.fetch_server_info
+      ret.size.should == 1
+      ret[0].should == @s2
+    end
+
+    it 'should return servers by groups' do
+      @obj.config[:groups] = 's1,s3'
+      ret = @obj.fetch_server_info
+      ret.size.should == 2
+      ret.should == [@s1, @s3]
+    end
+
+    it 'should return servers by Name' do
+      @obj.config[:name] = 's1'
+      ret = @obj.fetch_server_info
+      ret.size.should == 1
+      ret.should == [@s1]
+    end
+
+    it 'should return servers by public_ip_address' do
+      @obj.config[:public_ip_address] = 'ip_s3'
+      ret = @obj.fetch_server_info
+      ret.size.should == 1
+      ret.should == [@s3]
+    end
+
+    it 'should return nil if no server matches' do
+      ret = @obj.fetch_server_info
+      ret.should == nil
+    end
+  end
+
+
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-hitori
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -120,14 +120,19 @@ files:
 - README.md
 - Rakefile
 - knife-hitori.gemspec
+- lib/chef/knife/hitori/run_list_options.rb
 - lib/chef/knife/hitori/version.rb
 - lib/chef/knife/hitori_base.rb
+- lib/chef/knife/hitori_bootstrap.rb
 - lib/chef/knife/hitori_config.rb
 - lib/chef/knife/hitori_cook.rb
+- lib/chef/knife/hitori_data_bag_dec.rb
+- lib/chef/knife/hitori_data_bag_enc.rb
 - lib/chef/knife/hitori_hello.rb
 - lib/chef/knife/hitori_prepare.rb
 - lib/knife-hitori.rb
-- lib/knife-hitori/interactive_configure.rb
+- lib/knife-hitori/lib/interactive_configure.rb
+- lib/knife-hitori/lib/run_remote_cook.rb
 - lib/knife-hitori/resources/centos_bootstrap.erb
 - lib/knife-hitori/resources/do_cook.sh
 - lib/knife-hitori/resources/knife.erb
@@ -137,6 +142,7 @@ files:
 - refs/run_chef_solo.sh
 - refs/util/create_encrypt_databag.rb
 - refs/util/crypt_file.rb
+- spec/knife/hitori_bootstrap_spec.rb
 - spec/knife/hitori_config_spec.rb
 - spec/knife/hitori_cook_spec.rb
 - spec/knife/hitori_hello_spec.rb
@@ -168,6 +174,7 @@ signing_key:
 specification_version: 3
 summary: knife subcommand
 test_files:
+- spec/knife/hitori_bootstrap_spec.rb
 - spec/knife/hitori_config_spec.rb
 - spec/knife/hitori_cook_spec.rb
 - spec/knife/hitori_hello_spec.rb