knife-sharp 0.4.5 → 0.5.1

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

@@ -1,5 +1,8 @@
+require 'knife-sharp/common'
+
 module KnifeSharp
   class SharpRollback < Chef::Knife
+    include KnifeSharp::Common
 
     banner "knife sharp rollback [--list] [--to <identifier>] [--show <identifier>]"
 
@@ -22,8 +25,8 @@ module KnifeSharp
       :default => false
 
     deps do
+      require 'chef/environment'
       require 'chef/cookbook/metadata'
-      require 'chef/cookbook_loader'
     end
 
     def run()
@@ -60,39 +63,13 @@ module KnifeSharp
         exit 1
       end
 
-
-      # Sharp config
-      cfg_files = [ "/etc/sharp-config.yml", "~/.chef/sharp-config.yml" ]
-      loaded = false
-      cfg_files.each do |cfg_file|
-        begin
-          @cfg = YAML::load_file(File.expand_path(cfg_file))
-          loaded = true
-        rescue Exception => e
-          ui.error "Error on loading config : #{e.inspect}" if config[:verbosity] > 0
-        end
-      end
-      unless loaded == true
-        ui.error "config could not be loaded ! Tried the following files : #{cfg_files.join(", ")}"
-        exit 1
-      end
-
-      # Knife config
-      if Chef::Knife.chef_config_dir && File.exists?(File.join(Chef::Knife.chef_config_dir, "knife.rb"))
-        Chef::Config.from_file(File.join(Chef::Knife.chef_config_dir, "knife.rb"))
-      else
-        ui.error "Cannot find knife.rb config file"
-        exit 1
-      end
-
       chefcfg = Chef::Config
       @cb_path = chefcfg.cookbook_path.is_a?(Array) ? chefcfg.cookbook_path.first : chefcfg.cookbook_path
-      @loader = Chef::CookbookLoader.new(@cb_path)
     end
 
     def list_rollback_points()
       ui.msg("Available rollback points :")
-      Dir.glob(File.join(@cfg["rollback"]["destination"], "*.json")).each do |f|
+      Dir.glob(File.join(sharp_config["rollback"]["destination"], "*.json")).each do |f|
         ts = File.basename(f, ".json")
         ui.msg("  * #{ts} (#{Time.at(ts.to_i).to_s})")
       end
@@ -108,7 +85,7 @@ module KnifeSharp
       end
 
       begin
-        fp = File.open(File.join(@cfg["rollback"]["destination"],"#{identifier}.json"),"r")
+        fp = File.open(File.join(sharp_config["rollback"]["destination"],"#{identifier}.json"),"r")
         infos = JSON.load(fp)
       rescue
         ui.error("could not load rollback point #{identifier}")
@@ -125,7 +102,7 @@ module KnifeSharp
 
     def show_rollback_point(identifier)
       begin
-        fp = File.open(File.join(@cfg["rollback"]["destination"],"#{identifier}.json"),"r")
+        fp = File.open(File.join(sharp_config["rollback"]["destination"],"#{identifier}.json"),"r")
       rescue
         ui.error("could not load rollback point #{identifier}")
         exit 1

data/lib/knife-sharp.rb

@@ -1,3 +1,3 @@
 module KnifeSharp
-  VERSION = "0.4.5"
+  VERSION = "0.5.1"
 end

data/lib/knife-sharp/common.rb

@@ -0,0 +1,113 @@
+require 'logger'
+
+module KnifeSharp
+  module Common
+    module ClassMethods; end
+
+    module InstanceMethods
+      def sharp_config
+        return @sharp_config unless @sharp_config.nil?
+
+        config_file = File.expand_path("~/.chef/sharp-config.yml")
+
+        begin
+          @sharp_config = YAML::load_file(config_file)
+        rescue Exception => e
+          ui.error "Failed to load config file #{config_file}: #{e.message}"
+          exit 1
+        end
+
+        @sharp_config
+      end
+
+      def ensure_correct_branch_provided!
+        # Checking current branch
+        given_branch = @name_args.first
+        current_branch = Grit::Repo.new(sharp_config["global"]["git_cookbook_path"]).head.name
+
+        if given_branch != current_branch then
+          ui.error "Git repo is actually on branch #{current_branch} but you want to align using #{given_branch}. Checkout to the desired one."
+          exit 1
+        end
+      end
+
+      def ensure_branch_and_environment_provided!
+        if @name_args.size != 2
+          show_usage
+          exit 1
+        end
+      end
+
+      def environment
+        @environment ||= @name_args.last
+      end
+
+      def cookbook_path
+        @cookbook_path ||= [Chef::Config.send(:cookbook_path)].flatten.first
+      end
+
+      def data_bag_path
+        @data_bag_path ||= [Chef::Config.send(:data_bag_path)].flatten.first
+      end
+
+      def role_path
+        @role_path ||= [Chef::Config.send(:role_path)].flatten.first
+      end
+
+      def logger
+        return @logger unless @logger.nil?
+
+        begin
+          log_file = sharp_config["logging"]["destination"] || "~/.chef/sharp.log"
+          @logger = Logger.new(File.expand_path(log_file))
+        rescue Exception => e
+          ui.error "Unable to set up logger (#{e.inspect})."
+          exit 1
+        end
+
+        @logger
+      end
+
+      def chef_server
+        @chef_server ||= SharpServer.new.current_server
+      end
+
+      def log_action(message)
+        # log file if enabled
+        log_message = message
+        log_message += " on server #{chef_server}" if chef_server
+        logger.info(log_message) if sharp_config["logging"]["enabled"]
+
+        # any defined notification method (currently, only hubot, defined below)
+        if sharp_config["notification"]
+          sharp_config["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(message, config={})
+        begin
+          require "net/http"
+          require "uri"
+          uri = URI.parse("#{config["url"]}/#{config["channel"]}")
+          notif = "chef: #{message} by #{config["username"]}"
+          Net::HTTP.post_form(uri, { "message" => notif })
+        rescue
+          ui.error "Unable to notify via hubot."
+        end
+      end
+    end
+
+    def self.included(receiver)
+      receiver.extend(ClassMethods)
+      receiver.send(:include, InstanceMethods)
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-sharp
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.1
 platform: ruby
 authors:
 - Nicolas Szalay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.14.0
+        version: '11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.14.0
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: grit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.5'
 description: Sharpen your knife
 email:
 - nico@rottenbytes.info
@@ -47,14 +47,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- Gemfile
+- Gemfile.lock
 - README.md
+- Rakefile
 - ext/sharp-config.yml
+- knife-sharp.gemspec
 - lib/chef/knife/sharp-align.rb
 - lib/chef/knife/sharp-backup.rb
+- lib/chef/knife/sharp-cookbook-align.rb
+- lib/chef/knife/sharp-data_bag-align.rb
 - lib/chef/knife/sharp-history.rb
+- lib/chef/knife/sharp-role-align.rb
 - lib/chef/knife/sharp-rollback.rb
 - lib/chef/knife/sharp-server.rb
 - lib/knife-sharp.rb
+- lib/knife-sharp/common.rb
 homepage: https://github.com/Fotolia/knife-sharp
 licenses:
 - 3-BSD
@@ -75,7 +84,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: Knife sharp plugin