knife-sharp 0.1.4 → 0.1.6

data/ext/sharp-config.yml

@@ -10,3 +10,4 @@ notification:
     url: "http://your.hubot.lan:18080/hubot/chef/bump/"
     channel: "foo"
     username: "Nicolas"
+    skip: [dev]

data/lib/chef/knife/sharp-align.rb

@@ -4,7 +4,7 @@ require 'grit'
 module KnifeSharp
   class SharpAlign < Chef::Knife
 
-    banner "knife sharp align BRANCH ENVIRONMENT [--debug] [--quiet]"
+    banner "knife sharp align BRANCH ENVIRONMENT [--debug]"
 
     option :debug,
       :short => '-d',
@@ -12,12 +12,6 @@ module KnifeSharp
       :description => "turn debug on",
       :default => false
 
-    option :quiet,
-      :short => '-q',
-      :long => '--quiet',
-      :description => 'does not notifies',
-      :default => false
-
     deps do
       require 'chef/cookbook/metadata'
       require 'chef/cookbook_loader'
@@ -26,6 +20,7 @@ module KnifeSharp
 
     def run
       setup()
+      ui.msg "On server #{@chef_server}" if @chef_server
       ui.msg "Aligning cookbooks"
       align_cookbooks()
       ui.msg "Aligning data bags"
@@ -65,6 +60,18 @@ module KnifeSharp
         exit 1
       end
 
+      # Logger
+      if @cfg["logging"]["enabled"]
+        begin
+          require "logger"
+          log_file = File.expand_path(@cfg["logging"]["destination"])
+          @log = Logger.new(log_file)
+        rescue Exception => e
+          ui.error "Unable to set up logger (#{e.inspect})."
+          exit 1
+        end
+      end
+
       # Env setup
       @branch, @environment = name_args
       @chef_path = @cfg["global"]["git_cookbook_path"]
@@ -74,6 +81,9 @@ module KnifeSharp
       @db_path = chefcfg.data_bag_path.is_a?(Array) ? chefcfg.data_bag_path.first : chefcfg.data_bag_path
       @role_path = chefcfg.role_path.is_a?(Array) ? chefcfg.role_path.first : chefcfg.role_path
 
+      @chef_server = SharpServer.new.current_server
+      @loader = Chef::CookbookLoader.new(@cb_path)
+
       # Checking current branch
       current_branch = Grit::Repo.new(@chef_path).head.name
       if @branch != current_branch then
@@ -86,8 +96,8 @@ module KnifeSharp
 
     def align_cookbooks
       updated_versions = Hash.new()
-      local_versions = get_cookbook_local_versions()
-      remote_versions = get_cookbook_versions_from_env(@environment)
+      local_versions = Hash[Dir.glob("#{@cb_path}/*").map {|cb| [File.basename(cb), @loader[File.basename(cb)].version] }]
+      remote_versions = Chef::Environment.load(@environment).cookbook_versions.each_value {|v| v.gsub!("= ", "")}
 
       (local_versions.keys - remote_versions.keys).each do |cb|
         updated_versions[cb] = local_versions[cb]
@@ -101,36 +111,37 @@ module KnifeSharp
         end
       end
 
-      bumped = Hash.new
       if !updated_versions.empty?
         all = false
+        bumped = Array.new
         env = Chef::Environment.load(@environment)
-        loader = Chef::CookbookLoader.new(@cb_path)
         updated_versions.each_pair do |cb,version|
           answer = ui.ask_question("Update #{cb} cookbook item on server ? Y/N/(A)ll/(Q)uit ", :default => "N").upcase unless all
 
           if answer == "A"
             all = true
           elsif answer == "Q"
-            ui.msg "> Aborting cookbook alignment."
+            ui.msg "> Skipping next cookbooks alignment."
             break
           end
 
           if all or answer == "Y"
-            log_action("* Uploading cookbook #{cb} version #{version}")
-            cb_obj = loader[cb]
-            uploader = Chef::CookbookUploader.new(cb_obj, @cb_path)
-            uploader.upload_cookbooks
             env.cookbook_versions[cb] = version
-            bumped[cb] = version
+            bumped << @loader[cb]
           else
             ui.msg "* Skipping #{cb} cookbook"
           end
         end
-        if env.save
-          bumped.each do |cb, version|
-            log_action("* Bumping cookbook #{cb} to #{version} for environment #{@environment}")
-            hubot_notify(cb, version, @environment)
+
+        unless bumped.empty?
+          ui.msg "* Uploading cookbook(s) #{bumped.map{|cb| cb.name.to_s}.join(",")}"
+          uploader = Chef::CookbookUploader.new(bumped, @cb_path)
+          uploader.upload_cookbooks
+          if env.save
+            bumped.each do |cb|
+              ui.msg "* Bumping #{cb.name.to_s} to #{cb.version} for environment #{@environment}"
+              log_action("bumping #{cb.name.to_s} to #{cb.version} for environment #{@environment}")
+            end
           end
         end
       else
@@ -138,22 +149,6 @@ module KnifeSharp
       end
     end
 
-    # get cookbook for a known environment
-    def get_cookbook_versions_from_env(env_name)
-      Chef::Environment.load(env_name).cookbook_versions.each_value {|v| v.gsub!("= ", "")}
-    end
-
-    # in your local dealer !
-    def get_cookbook_local_versions
-      cbs = Hash.new
-      Dir.glob("#{@cb_path}/*").each do |cookbook|
-        md = Chef::Cookbook::Metadata.new
-        md.from_file("#{cookbook}/metadata.rb")
-        cbs[File.basename(cookbook)] = md.version
-      end
-      return cbs
-    end
-
     ### Databag methods ###
 
     def align_databags
@@ -220,6 +215,7 @@ module KnifeSharp
 
           if all or answer == "Y"
             ui.msg "* Updating #{name.join("/")} data bag item"
+            log_action("updating #{name.join("/")} data bag item")
             db = Chef::DataBagItem.new
             db.data_bag(name.first)
             db.raw_data = obj
@@ -307,6 +303,7 @@ module KnifeSharp
 
           if all or answer == "Y"
             ui.msg "* Updating #{name} role"
+            log_action("updating #{name} role")
             obj.save
           else
             ui.msg "* Skipping #{name} role"
@@ -320,40 +317,35 @@ module KnifeSharp
     ### Utility methods ###
 
     def log_action(message)
-      ui.msg(message)
-
-      if @cfg["logging"]["enabled"]
-        begin
-          require "logger"
-          log_file = File.expand_path(@cfg["logging"]["destination"])
-          log = Logger.new(log_file)
-          log.info(message)
-          log.close
-        rescue Exception => e
-          ui.error "Oops ! #{e.inspect} ! message to log was #{message}"
+      # log file if enabled
+      log_message = message
+      log_message += " on server #{@chef_server}" if @chef_server
+      @log.info(log_message) if @cfg["logging"]["enabled"]
+
+      # any defined notification method (currently, only hubot, defined below)
+      if @cfg["notification"]
+        @cfg["notification"].each do |carrier, data|
+          skipped = Array.new
+          skipped = data["skip"] if data["skip"]
+
+          if data["enabled"] and !skipped.include?(@chef_server)
+            send(carrier, message, data)
+          end
         end
       end
     end
 
-    def hubot_notify(cookbook, to_version, environment)
-      unless @cfg["notification"]["hubot"]["enabled"] == true and config[:quiet] == false
-        ui.msg "Aborting due to quiet or config disabled" if config[:debug]
-        return
-      end
-
+    def hubot(message, config={})
       begin
         require "net/http"
         require "uri"
-        uri = URI.parse(@cfg["notification"]["hubot"]["url"] + @cfg["notification"]["hubot"]["channel"])
-        user = @cfg["notification"]["hubot"]["username"]
-
-        Net::HTTP.post_form(uri, { "cookbook" => cookbook,
-                                   "user" => user,
-                                   "to_version" => to_version,
-                                   "environment" => environment })
+        uri = URI.parse("#{config["url"]}/#{config["channel"]}")
+        notif = "chef: #{message} by #{config["username"]}"
+        Net::HTTP.post_form(uri, { "message" => notif })
       rescue
-        ui.error "Oops ! could not notify hubot !"
+        ui.error "Unable to notify via hubot."
       end
     end
+
   end
 end

data/lib/chef/knife/sharp-server.rb

@@ -1,28 +1,33 @@
 module KnifeSharp
   class SharpServer < Chef::Knife
 
-    banner "knife sharp server [SERVERNAME]"
+    banner "knife sharp server [SERVERNAME] [--machine]"
+
+    option :machine,
+      :short => '-m',
+      :long  => '--machine',
+      :description => "turn machine output on",
+      :default => false
 
     def run
-      if File.exists?(knife_conf)
-        if !File.symlink?(knife_conf)
-          ui.error "#{knife_conf} is not a symlink."
-          ui.msg "Copy it to #{knife_conf("<server name>")} and try again."
-          exit 1
-        end
+      if File.exists?(knife_conf) and !File.symlink?(knife_conf)
+        ui.error "#{knife_conf} is not a symlink."
+        ui.msg "Copy it to #{knife_conf("<server name>")} and try again."
+        exit 1
       end
       unless name_args.size == 1
         list_configs
         exit 0
       end
-
       update_config(name_args.first)
     end
 
     def update_config(new_server)
-      if File.exists?(knife_conf(new_server))
-        File.unlink(knife_conf) if File.exists?(knife_conf)
-        File.symlink(knife_conf(new_server), knife_conf)
+      cur_conf = knife_conf
+      new_conf = knife_conf(new_server)
+      if File.exists?(new_conf)
+        File.unlink(cur_conf) if File.exists?(cur_conf)
+        File.symlink(new_conf, cur_conf)
         ui.msg "The knife configuration has been updated to use #{new_server}."
       else
         ui.error "Knife configuration for #{new_server} not found."
@@ -32,23 +37,41 @@ module KnifeSharp
     end
 
     def list_configs
-      current_conf = File.readlink(knife_conf) if File.exists?(knife_conf)
-      avail_confs = Dir.glob(File.join(Chef::Knife::chef_config_dir, "knife-*.rb"))
-      if !avail_confs.empty?
-        ui.msg "Available servers:"
-        avail_confs.each do |file|
-          name = file.match(/#{Chef::Knife::chef_config_dir}\/knife-(\w+)\.rb/)
-          prefix = (file == current_conf) ? ">> " : "   "
-          ui.msg "#{prefix}#{name[1]} (#{file})"
+      if config[:machine] == true
+        server = current_server()
+        if server
+          ui.msg server
+        else
+          ui.msg "invalid"
         end
       else
-        ui.msg "No knife server configuration file found."
+        avail_confs = Dir.glob(File.join(Chef::Knife::chef_config_dir, "knife-*.rb"))
+        if !avail_confs.empty?
+          ui.msg "Available servers:"
+          avail_confs.each do |file|
+            server = extract_server(file)
+            prefix = (server == current_server) ? ">> " : "   "
+            ui.msg "#{prefix}#{server} (#{file})"
+          end
+        else
+          ui.msg "No knife server configuration file found."
+        end
       end
     end
 
+    def extract_server(config_filename)
+      match = config_filename.match(/#{Chef::Knife::chef_config_dir}\/knife-(\w+)\.rb/)
+      match ? match[1] : nil
+    end
+
     def knife_conf(server = nil)
       srv = server ? "-#{server}" : ""
       File.join(Chef::Knife::chef_config_dir, "knife#{srv}.rb")
     end
+
+    def current_server
+      cur_conf = knife_conf
+      extract_server(File.readlink(cur_conf)) if File.exists?(cur_conf) and File.symlink?(cur_conf)
+    end
   end
 end

data/lib/knife-sharp.rb

@@ -1,3 +1,3 @@
 module KnifeSharp
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,57 +1,66 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: knife-sharp
-version: !ruby/object:Gem::Version
-  version: 0.1.4
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 6
+  version: 0.1.6
 platform: ruby
-authors:
+authors: 
 - Nicolas Szalay
 - Jonathan Amiez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-02-25 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: chef
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 10.14.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 119
+        segments: 
+        - 10
+        - 14
+        - 0
         version: 10.14.0
-- !ruby/object:Gem::Dependency
-  name: grit
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.5.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: grit
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
+  type: :runtime
+  version_requirements: *id002
 description: Sharpen your knife
-email:
+email: 
 - nico@rottenbytes.info
 - jonathan.amiez@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - README.md
 - ext/sharp-config.yml
 - lib/knife-sharp.rb
@@ -61,26 +70,36 @@ files:
 - lib/chef/knife/sharp-server.rb
 homepage: https://github.com/Fotolia/knife-sharp
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Knife sharp plugin
 test_files: []
+