knife-org-utils 0.1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af93ea12eb77961bc616479637517b54ba380e8b
-  data.tar.gz: d46ed3be6bf9dd7834a38879cc0bf02acb6fa44b
+  metadata.gz: 19d0abf791e3377010066677e0b004cd07a2723a
+  data.tar.gz: dd002443f0a027407a77d2610d8fc5cd4193b184
 SHA512:
-  metadata.gz: cf180b95ce94d019dcc9978d18c24141a3d2e6676da0c1a8dc702816fa6e24edb8980bf9595b3c17a0e0fbd6106521f6be93255a68838d05c5c0b52a5d45f549
-  data.tar.gz: 78d9e0139ebae2f513254101bdac08f133b5da596f52fb0c15405c1f2cbea90c7975f7355f34dc40dc1981fd18cd37e0aaa8f76d2d09e46ae9e5a233cd229a77
+  metadata.gz: 3070cf9eb65d75ef3136d76ae5855695dc77a9e90dc54a118621bf3823c2f80dafbadf745e72cce8aa11e562c448518487dd6b70637a65ae1ccfcb0c9dbb3358
+  data.tar.gz: 832f6b4d9e2d133fc58e7b3cef415eb02e12ae3ee9704cfddc2d8a766b701cc2ec555ad27812b78b1c585382aa548ff2bf5b03548a33d3a99814915ca0b782a9

data/README.md

@@ -2,10 +2,16 @@
 [![Gem Version](https://badge.fury.io/rb/knife-org-utils.svg)](http://badge.fury.io/rb/knife-org-utils) [![Build Status](https://travis-ci.org/secret-sauce/knife-org-utils.svg?branch=master)](https://travis-ci.org/secret-sauce/knife-org-utils) [![Dependency Status](https://gemnasium.com/secret-sauce/knife-org-utils.svg)](https://gemnasium.com/secret-sauce/knife-org-utils)
 
 
-### Description:
+## :no_entry: Warning :no_entry:
+
+Run `knife switch init` first.  
+
+Pre 1.0.0 version used git to manage the `~/.chef` folder. Version 1.0.x and above will not use git to manage the `~/.chef` directory. Please backup your `~/.chef` directory before adding new configurations.
+
+## Description:
 This is an EXPERIMENTAL knife plugin that allows you :
 
-- to switch your .chef config files and keys to point to one of your orgs based on command line options
+- to switch config files and keys in `~/.chef` quickly from command line.
 - to display information from the `knife.rb` config file in knife's configuration file search path.
 
 ## Installation
@@ -15,22 +21,22 @@ git repository and run the following command from inside the cloned repo:
 
     rake install
 
-
 ## Requirements
-  * create a `~/.chef` directory on your workstation and make it a git repo
-  * create branches, each branch containing the appropriate config file and pem files pointing to a specific org
+:warning: backup your current `~/.chef` directory :warning:
 
+## Available Subcommands and what they do for you
 
-## Subcommands
+### `knife switch init`
+Initializes your `.chef` directory.
 
 ### `knife switch add $CHEF_RERO_DIR`
-Imports `.chef` files from `$CHEF_RERO_DIR/.chef` into a new git branch in `~/.chef` folder. The name of the branch will be based on the `chef_server_url` in the `knife.rb` file. Starter Kit is a valid chef-repo directory.
+Imports `.chef` files from `$CHEF_RERO_DIR/.chef` into `~/.chef` folder. The name of the imported CONFIG will be based on the `chef_server_url` in the `knife.rb` file. Starter Kit is a valid chef-repo directory.
 
-### `knife switch BRANCH`
-checkout to this git branch containing your chef credentials, provided it exists.
+### `knife switch CONFIG`
+switches the configuration in `~/.chef` to the named CONFIG
 
 ### `knife switch list`
-list of available branches in `~/.chef` folder.
+list of available CONFIGS in `~/.chef` folder.
 
 ### `knife info [options]`
 prints the current chef server referenced by your `~/.chef/knife.rb`.

data/lib/chef/knife/switch.rb

@@ -1,26 +1,86 @@
 require 'chef/knife'
-require 'git'
 
 module KnifeOrgUtils
   class Switch < Chef::Knife
 
-    banner 'knife switch BRANCH'
+    banner 'knife switch CONFIG'
+
+    def root
+      @root ||= File.expand_path( '~/.chef' )
+    end
+
+    def config_name
+      @config_name ||= @name_args[0]
+    end
+
+    def server
+      parse_config_name unless @server
+      @server
+    end
+
+    def org
+      parse_config_name unless @org
+      @org
+    end
+
+    def parse_config_name
+      %r{^(?<server>[a-z_]+)/(?<org>[a-z_]+)$} =~ config_name
+      @server = server
+      @org = org
+    end
+
+    def source_knife_config
+      @source_knife_config ||= File.join( root, config_name, 'knife.rb' )
+    end
+
+    def dest_knife_config
+      ::File.join( root, 'knife.rb' )
+    end
+
+    def config_methods
+      %w(
+        log_level
+        log_location
+        node_name
+        client_key
+        validation_client_name
+        validation_key
+        chef_server_url
+      )
+    end
 
     def run
       unless @name_args.length == 1
-        ui.fatal 'You must specify an BRANCH name'
+        ui.fatal 'You must specify an CONFIG name.'
         show_usage
         exit 1
       end
 
-      @git = ::Git.open( '~/.chef' )
+      unless ::File.exists? source_knife_config
+        ui.fatal "#{source_knife_config} not found for #{config_name} config."
+        show_usage
+        exit 1
+      end
+
+      File.open( dest_knife_config, 'w' ) do | output |
+
+        server_dir = ::File.join( root, server )
+        org_dir = ::File.join( server_dir, org )
+
+        output.write( "# Generated by knife-org-utils for config #{config_name}\n" )
+        output.write( "server_dir = '#{server_dir}'\n" )
+        output.write( "org_dir = '#{org_dir}'\n" )
 
-      begin
-        @git.checkout( "#{@name_args[0]}" )
-        ui.msg "Switched to branch #{@name_args[0]}"
-      rescue Git::GitExecuteError => e
-        ui.error e.message
+        File.foreach( source_knife_config ) do | line |
+          %r{^(?<method>[a-zA-Z0-9_]+)\s+(?<param>.*)$} =~ line
+          if config_methods.include? method
+            dest_dir = ( method == 'client_key' ) ? 'server_dir' : 'org_dir'
+            param.gsub!( '#{current_dir}', "\#\{#{dest_dir}\}" )
+            output.write "#{method} #{param}\n"
+          end
+        end
       end
+      ui.msg "Switched to #{config_name} knife config."
     end
   end
 end

data/lib/chef/knife/switch_add.rb

@@ -1,5 +1,6 @@
 require 'chef/knife'
-require 'git'
+require 'fileutils'
+require "digest"
 
 module KnifeOrgUtils
   class SwitchAdd < Chef::Knife
@@ -10,93 +11,114 @@ module KnifeOrgUtils
       @kit_path ||= ::File.join( ::File.expand_path( @name_args[0] ), '.chef' )
     end
 
-    def dot_chef_path
-      @dot_chef_path ||= File.expand_path( '~/.chef' )
+    def root
+      @root ||= File.expand_path( '~/.chef' )
     end
 
-    def git
-      git = ::Git.open( dot_chef_path )
+    def server
+      parse_config unless @server
+      @server
     end
 
-    def run
-      unless @name_args.length == 1
-        ui.fatal 'You must specify the path to started kit CHEF-RERO-DIR'
-        show_usage
-        exit 1
-      end
+    def org
+      parse_config unless @org
+      @org
+    end
 
-      kit_files = get_kit_files
-      branch_name = get_branch_name
+    def user_name
+      parse_config unless @user_name
+      @user_name
+    end
 
-      unless branch_exists? branch_name
-        checkout( branch_name )
-        clean_files
-        copy_files( kit_files )
-        commit( branch_name )
-      else
-        ui.info "Branch for #{branch_name} already exists"
-      end
+    def validation_client_name
+      parse_config unless @validation_client_name
+      @validation_client_name
+    end
+
+    def user_pem
+      "#{user_name}.pem"
     end
 
     def get_kit_files
       unless ::File.exists?( kit_path ) && ::File.directory?( kit_path )
-        ui.fatal "Valid starter kit is not found at #{@name_args[0]}"
+        ui.fatal "Valid starter kit is not found at #{@name_args[0]}."
         exit 1
       end
       ::Dir.glob( "#{@kit_path}/**" ).select{ | f | ::File.file? f }
     end
 
-    def get_branch_name
+    def parse_config
       knife_path = ::File.join( kit_path, 'knife.rb' )
       knife_data = ::File.read( knife_path )
 
-      %r(^chef_server_url\s+"https{0,1}://(?<host>[a-zA-Z0-9-]+).*/organizations/(?<org>[a-zA-Z0-9_]+)"$) =~ knife_data
+      %r{
+        ^chef_server_url\s+"https{0,1}://(?<server>[a-zA-Z0-9-]+).*/organizations/(?<org>[a-zA-Z0-9_]+)"$
+      }x =~ knife_data
+
+      %r{
+        ^node_name\s+"(?<user_name>.*)"$
+      }x =~ knife_data
 
-      if host.nil? || org.nil?
-        ui.fatal "Invalid knife.rb at #{knife_path}"
+      %r{
+        ^validation_client_name\s+"(?<validation_client_name>.*)"$
+      }x =~ knife_data
+
+      if server.nil? || org.nil? || user_name.nil?
+        ui.fatal "Invalid knife.rb at #{knife_path}."
         exit 1
       end
 
-      "#{host}/#{org}"
+      @server = server
+      @org = org
+      @user_name = user_name
+      @validation_client_name = validation_client_name
     end
 
-    def branch_exists?( branch_name )
-      git.branches.local.find do | branch |
-        branch.name == branch_name
-      end
+    def get_config_name
+      ::File.join( server, org )
     end
 
-    def checkout( branch_name )
-      begin
-        git.branch( branch_name ).checkout
-      rescue Git::GitExecuteError => e
-        ui.fatal e.message
-        exit 1
-      end
+    def get_dest_path( config_name )
+      ::File.join( root, config_name )
     end
 
     def copy_files( files )
-      files.each do | file |
-        filename = ::File.basename file
-        dest = ::File.join( dot_chef_path, filename )
-        ::FileUtils.copy( file, dest )
+      server_dir = ::File.join( root, server )
+      org_dir = ::File.join( server_dir, org )
+
+      files.each do | source |
+        filename = ::File.basename source
+
+        dest_dir = ( user_pem == filename ) ? server_dir : org_dir
+        dest = ::File.join( dest_dir, filename )
+
+        if ::File.exist?( dest )
+          source_sha = Digest::SHA2.file( source ).hexdigest
+          dest_sha = Digest::SHA2.file( dest ).hexdigest
+          ui.warn "File #{dest} already exists with different content. Skipped." unless source_sha.eql?( dest_sha )
+        else
+          ::FileUtils.copy( source, dest )
+        end
       end
     end
 
-    def clean_files
-      files = ::Dir.glob( "#{dot_chef_path}/**" ).select{ | f | ::File.file? f }
-      files.each do |file|
-        ::File.unlink( file )
+    def run
+      unless @name_args.length == 1
+        ui.fatal 'You must specify the path to started kit CHEF-RERO-DIR.'
+        show_usage
+        exit 1
       end
-    end
 
-    def commit( branch_name )
-      begin
-        git.add( :all=>true )
-        git.commit( "Adding #{branch_name} from #{kit_path}" )
-      rescue Git::GitExecuteError => e
-        ui.fatal e.message
-        exit 1
+      kit_files = get_kit_files
+      config_name = get_config_name
+      dest_path = get_dest_path config_name
+
+      if ::File.directory? dest_path
+        ui.info "Configuration for #{dest_path} already exists."
+      else
+        ::FileUtils.mkpath dest_path
+        copy_files( kit_files )
+        ui.msg "Added #{config_name} to #{root}."
       end
     end
   end

data/lib/chef/knife/switch_init.rb

@@ -0,0 +1,21 @@
+require 'chef/knife'
+
+module KnifeOrgUtils
+  class SwitchInit < Chef::Knife
+
+    banner 'knife switch init'
+
+    def dot_chef_path
+      @dot_chef_path ||= ::File.expand_path( '~/.chef' )
+    end
+
+    def run
+      if ::File.directory? dot_chef_path
+        ui.error "Directory #{dot_chef_path} exists. Please backup and remove this directory before initializing."
+        exit 1
+      else
+        ::Dir.mkdir dot_chef_path
+      end
+    end
+  end
+end

data/lib/chef/knife/switch_list.rb

@@ -1,14 +1,40 @@
 require 'chef/knife'
-require 'git'
 
 module KnifeOrgUtils
   class SwitchList < Chef::Knife
 
     banner 'knife switch list'
 
+    def root
+      @root ||= File.expand_path( '~/.chef' )
+    end
+
+    def current_config
+      parse_knife_rb unless @current_config
+      @current_config
+    end
+
+    def parse_knife_rb
+      knife_rb = ::File.join( root, 'knife.rb' )
+      knife_data = ::File.read( knife_rb )
+      %r{
+        ^chef_server_url\s+"https{0,1}://(?<server>[a-zA-Z0-9-]+).*/organizations/(?<org>[a-zA-Z0-9_]+)"$
+      }x =~ knife_data
+
+      @current_config = "#{server}/#{org}"
+    end
+
     def run
-      @git = ::Git.open( '~/.chef' )
-      ui.msg @git.branches.local
+      Dir.glob("#{root}/*/*/").each do | dir |
+        config_name = dir.gsub(%r{^#{root}/}, '').chomp('/')
+
+        current = if ( current_config == config_name )
+          "\xF0\x9F\x8D\xB4  "
+        else
+          "   "
+        end
+        ui.msg "#{current}#{config_name}"
+      end
     end
   end
 end

data/lib/knife-org-utils/version.rb

@@ -1,3 +1,3 @@
 module KnifeOrgUtils
-  VERSION = '0.1.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-org-utils
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Venkat Venkataraju
@@ -9,93 +9,71 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: git
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '11.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.16.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '11.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.16.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Manages your .chef org, and provides info about your chef config
+        version: '3'
+description: Manages multiple chef server/org configuration files in the .chef folder.
 email:
 - ven@yahoo-inc.com
 - shruthiv@yahoo-inc.com
@@ -107,21 +85,26 @@ files:
 - lib/chef/knife/info.rb
 - lib/chef/knife/switch.rb
 - lib/chef/knife/switch_add.rb
+- lib/chef/knife/switch_init.rb
 - lib/chef/knife/switch_list.rb
 - lib/knife-org-utils/version.rb
 homepage: https://github.com/secret-sauce/knife-org-utils.git
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: "  \e[1;33;40m!!! Warning !!!\e[0m\n  \e[0;36;40mPlease ignore
+  this message if you do not use 'knife switch'\e[0m\n  Pre 1.0.0 version used git
+  to manage the ~/.chef folder. Version 1.0.x and\n  above will not use git to manage
+  the ~/.chef directory. Please backup your\n  ~/.chef directory before adding new
+  configurations.\n  More info: https://github.com/secret-sauce/knife-org-utils/blob/master/README\n\n"
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="