knife-github 0.0.9 → 0.1.0

data/README.md

@@ -3,21 +3,35 @@ knife-github
 
 Chef knife plugin to interact with the github enterprise appliance.
 
-Attributes
+Configurations
 ==========
 
-You can configure the following attributes within your knife.rb
+### Central Configuration.
+When working on customer admin machines, it's recommended to used an central configuration file.
+This file should be created in: /etc/githubrc.rb and can contain any attribute in the following structure:
+
+    github_url			"https://github.schubergphilis.com"
+    github_link             	"ssh"
+    github_organizations    	[ "TLA-Cookbooks", "SBP-Cookbooks" ]
+
+Please note: these options are recommended for the central config file:
+
+### Personal Configuration.
+You can also configure attributes within your ~/.chef/knife.rb in the following structure:
 
-    knife[:github_url]             = 'https://github.company.lan'  
-    knife[:github_organizations]   = [ 'customer-cookbooks', 'central-cookbooks' ] 
-    knife[:github_link]            = 'ssh' 
+    knife[:github_token]           = '28374928374928374923874923842'  
     knife[:github_api_version]     = 'v3'  
     knife[:github_ssl_verify_mode] = 'verify_none'
 
+Please note: these settings will overwrite the central settings. 
+In a perfect world, your personal configuration file only contains your token information.
+
 ###### github_url
-This will be the URL to your local github appliance.  
+This will be the URL to your (personal) github enterprise appliance.
 Here you can also use the github.com address if you don't have an internal appliance.
 
+Attributes
+==========
 ###### github_organizations
 Here you specify the organizations that you want to taget when searching for cookbooks.  
 The first entry will have priority over the other entries.
@@ -37,7 +51,7 @@ Other
 =====
 
 Cache files will be created into the: ~/.chef directory.
-We use cache files to offload the api calls and increase the performance for additional executions.  
+We use cache files to offload the api calls and increase the performance for repetitive executions
 Updated to any repo inside the organization will cause the cache files to update.  
 But in case of any problems, the cache files can be safely deleted.
 

data/knife-github.gemspec

@@ -19,5 +19,6 @@ Gem::Specification.new do |s|
   s.require_paths     = ["lib"]
   s.license           = 'Apache 2.0'
   s.add_dependency "mixlib-versioning", ">= 1.0.0"
+  s.add_dependency "ruby-termios", ">= 0.9.6"
   s.add_dependency "chef", ">= 10.0.0"
 end

data/lib/chef/knife/github_baselist.rb

@@ -22,36 +22,36 @@ class Chef
 
       def self.included(includer)
         includer.class_eval do
-    
+
           option :fields,
-                 :long => "--fields 'NAME, NAME'",
-                 :description => "The fields to output, comma-separated"
-      
+            :long => "--fields 'NAME, NAME'",
+            :description => "The fields to output, comma-separated"
+
           option :fieldlist,
-                 :long => "--fieldlist",
-                 :description => "The available fields to output/filter",
-                 :boolean => true
-      
+            :long => "--fieldlist",
+            :description => "The available fields to output/filter",
+            :boolean => true
+
           option :noheader,
-                 :long => "--noheader",
-                 :description => "Removes header from output",
-                 :boolean => true
-      
+            :long => "--noheader",
+            :description => "Removes header from output",
+            :boolean => true
+
           def display_info(data, columns, match = [])
             object_list = []
-      
+
             if config[:fields]
               config[:fields].split(',').each { |n| object_list << ui.color(("#{n}").capitalize.strip, :bold) }
             else
               columns.each { |c| r = c.split(","); object_list << ui.color(("#{r.last}").strip, :bold) }
             end
-      
+
             col = object_list.count
             object_list = [] if config[:noheader]
-      
+
             data.each do |k,v|
               if config[:fields]
-                 config[:fields].downcase.split(',').each { |n| object_list << ((v["#{n}".strip]).to_s || 'n/a') }
+                config[:fields].downcase.split(',').each { |n| object_list << ((v["#{n}".strip]).to_s || 'n/a') }
               else
                 color = :white
                 if !match.empty? && !config[:all]
@@ -59,25 +59,25 @@ class Chef
                   if matches.uniq.count == 1
                     next if config[:mismatch]
                   else
-                    color = :yellow 
+                    color = :yellow
                   end
                 end
                 columns.each { |c|  r = c.split(","); object_list << ui.color((v["#{r.first}"]).to_s, color) || 'n/a' }
               end
             end
-      
+
             puts ui.list(object_list, :uneven_columns_across, col)
             display_object_fields(data) if locate_config_value(:fieldlist)
           end
-      
+
           def display_object_fields(object)
             exit 1 if object.nil? || object.empty?
             object_fields = [
               ui.color('Key', :bold),
               ui.color('Type', :bold),
               ui.color('Value', :bold)
-             ]
-             object.first.each do |n|
+            ]
+            object.first.each do |n|
               if n.class == Hash
                 n.keys.each do |k,v|
                   object_fields << ui.color(k, :yellow, :bold)

data/lib/chef/knife/github_cleanup.rb

@@ -15,22 +15,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# ---------------------------------------------------------------------------- #
-# Abstract
-# ---------------------------------------------------------------------------- #
-# This code is intended to help you cleaning up your locate repo's.
-# It will check if your repo if insync with the github and will not touch if
-# this is not the case. Then it will check if you have any branches local
-# and not on the github.
-#
-# If it cannot find any uncommitted changes, it will safely remove your repo.
-# It's good practice to cleanup and re-download repos because this way they 
-# can move from organization to organization.
-# ---------------------------------------------------------------------------- #
-#
 require 'chef/knife'
 
 module KnifeGithubCleanup
+  # This module is intended to help you cleaning up your locate repo's.
+  # It will check if your repo if insync with the github and will not touch if
+  # this is not the case. Then it will check if you have any branches local
+  # and not on the github.
+  #
+  # If it cannot find any uncommitted changes, it will safely remove your repo.
+  # It's good practice to cleanup and re-download repos because this way they 
+  # can move from organization to organization.
   class GithubCleanup < Chef::Knife
 
   deps do

data/lib/chef/knife/github_clone.rb

@@ -18,10 +18,11 @@
 
 require 'chef/knife'
 
-class Chef
-  class Knife
+  module KnifeGitHubClone
 
-    class GithubClone < Knife
+    # Clones a cookbook version to your local cookbooks directory
+    #
+    class GithubClone < Chef::Knife
 
       deps do
         require 'chef/knife/github_base'
@@ -101,6 +102,5 @@ class Chef
         end
       end
 
-    end
   end
 end

data/lib/chef/knife/github_compare.rb

@@ -18,9 +18,9 @@
 
 require 'chef/knife'
 
-class Chef
-  class Knife
-    class GithubCompare < Knife
+module KnifeGithubCompare
+  # Compare cookbooks in chef with those in the repository
+  class GithubCompare < Chef::Knife
 
       deps do
         require 'chef/knife/github_base'
@@ -92,6 +92,5 @@ class Chef
         end
 
       end
-    end
-  end
+   end
 end

data/lib/chef/knife/github_deploy.rb

@@ -1,58 +1,57 @@
 require 'chef/knife'
 
-class Chef
-  class Knife
-    # Implements the knife github deploy function
-    # @author:: Ian Southam (<isoutham@schubergphilis.com>)
-    # Copyright:: Copyright (c) 2013 Ian Southam.
-    # This code is specific to our company workflow
-    #
-    # == Overview
-    # All modes presume you have used github download to download a cookbook or
-    # are creating a new cookbook
-    #
-    # === Examples
-    # Deploy a development version of cookbook to your chef server
-    #    knife github deploy cookbook_name 
-    #    
-    # Deploy a release version of cookbook to your chef server
-    #    knife github deploy cookbook_name -f
-    #
-    # === Options
-    # -f Operate in final release mode
-    # -p Update the patch component of the version
-    # -m Update the minor component of the version
-    # -M Update the minor component of the version
-    # 
-    # == Operation Modes
-    # Development (default)
-    #
-    # This will take a cookbook name
-    # Do some basic version checks (if the current cookbook is frozen) and
-    # upload it
-    #
-    # If the cookbook is frozen it will force you to choose a new version
-    # and update the metadata accordingly
-    #
-    # Release (-f)
-    #
-    # You will be forced to select a new version.
-    # You can choose via the options whether to increment the Major/minor or patch
-    # revision numbers
-    # The version will be tagged
-    # Uploaded to the Chef server and frozen
-    #
-    # == Version numbers
-    #
-    # You can choose a specific version number by specifying it on the command
-    # line.
-    #
-    # If you do not specify a version, the version will be the version in your
-    # cookbook's metadata
-    #
-    # A warning is issued if the version is lower than the version in github
-    #
-    class GithubDeploy < Knife
+module KnifeGithubDeploy
+  # Implements the knife github deploy function
+  # @author:: Ian Southam (<isoutham@schubergphilis.com>)
+  # Copyright:: Copyright (c) 2013 Ian Southam.
+  # This code is specific to our company workflow
+  #
+  # == Overview
+  # All modes presume you have used github download to download a cookbook or
+  # are creating a new cookbook
+  #
+  # === Examples
+  # Deploy a development version of cookbook to your chef server
+  #    knife github deploy cookbook_name 
+  #    
+  # Deploy a release version of cookbook to your chef server
+  #    knife github deploy cookbook_name -f
+  #
+  # === Options
+  # -f Operate in final release mode
+  # -p Update the patch component of the version
+  # -m Update the minor component of the version
+  # -M Update the major component of the version
+  # 
+  # == Operation Modes
+  # Development (default)
+  #
+  # This will take a cookbook name
+  # Do some basic version checks (if the current cookbook is frozen) and
+  # upload it
+  #
+  # If the cookbook is frozen it will force you to choose a new version
+  # and update the metadata accordingly
+  #
+  # Release (-f)
+  #
+  # You will be forced to select a new version.
+  # You can choose via the options whether to increment the Major/minor or patch
+  # revision numbers
+  # The version will be tagged
+  # Uploaded to the Chef server and frozen
+  #
+  # == Version numbers
+  #
+  # You can choose a specific version number by specifying it on the command
+  # line.
+  #
+  # If you do not specify a version, the version will be the version in your
+  # cookbook's metadata
+  #
+  # A warning is issued if the version is lower than the version in github
+  #
+  class GithubDeploy < Chef::Knife
       deps do
         require 'chef/knife/github_base'
         include Chef::Knife::GithubBase
@@ -333,6 +332,5 @@ class Chef
           return true
       end
 
-    end
   end
 end

data/lib/chef/knife/github_diff.rb

@@ -18,10 +18,7 @@
 
 require 'chef/knife'
 
-class Chef
-  class Knife
-
-    class GithubDiff < Knife
+    module GithubDiff
     # Implements a diff function between your downloaded copy from git and what is in the Chef Server
     # 
     # By default, it expects that you have already done knife github download COOKBOOK
@@ -31,6 +28,7 @@ class Chef
     # You can also diff a cookbook against the github version bu using the -g option
     # 
     # You can also optionally give a version on the command line
+    class GithubDiff < Chef::Knife
 
       deps do
         require 'chef/knife/github_base'
@@ -150,7 +148,5 @@ class Chef
         end
         return version
       end 
-
-    end
   end
 end

data/lib/chef/knife/github_list.rb

@@ -18,10 +18,9 @@
 
 require 'chef/knife'
 
-class Chef
-  class Knife
+module KnifeGithubList
 
-    class GithubList < Knife
+  class GithubList < Chef::Knife
 
       deps do
         require 'chef/knife/github_base'
@@ -94,6 +93,5 @@ class Chef
 
       end
 
-    end
   end
 end

data/lib/chef/knife/github_pin.rb

@@ -18,8 +18,7 @@
 
 require 'chef/knife'
 
-class Chef
-  class Knife
+module KnifeGithubPin
 
     # Pin a specific cookbook version to an environment
     # 
@@ -28,7 +27,7 @@ class Chef
     # In some respects does duplicate some functionality that can be found
     # in spork but, I want a single set of tools that would help people
     # to get quickly up to speed with using chef in an industrialised environment
-    class GithubPin < Knife
+    class GithubPin < Chef::Knife
       deps do
         require 'chef/knife/github_base'
         require 'chef/knife/core/object_loader'
@@ -53,8 +52,9 @@ class Chef
         @version = nil
         @env     = nil
  
-        if @cookbook_name.empty?
+        if @cookbook_name.nil?
            Chef::Log.error("You must specify a cookbook name to use this module")
+           exit 1;
         end
 
         # Parameter 2 can be a version or an environment (if version is not given) or nothing
@@ -133,6 +133,5 @@ class Chef
         @env
       end
 
-    end
   end
 end

data/lib/chef/knife/{github_create.rb → github_repo_create.rb}

@@ -16,24 +16,34 @@
 # limitations under the License.
 #
 
-
-#
-#
-#  BE AWARE THIS COMMAND IS STILL UNDER HEAVY DEVELOPMENT!
-#
-#
 require 'chef/knife'
 
-module KnifeGithubCreate
-  class GithubCreate < Chef::Knife
-
+module KnifeGithubRepoCreate
+  class GithubRepoCreate < Chef::Knife
+    # Implements the knife github repo create function
+    #
+    # == Overview
+    # The command will create a empty cookbook structure and it will commit this one into the github.
+    #
+    # === Examples
+    # Create a new cookbook:
+    #    knife github repo create <name> <here you give your cookbook description>
+    #
+    #   #  Deploy a release version of cookbook to your chef server
+    #   #     knife github deploy cookbook_name -f
+    #
+    # === Options
+    # -t --github_token		Authentication token for the github.
+    # -U --github_user_repo	Create the cookbook in the user environment.
+    #
+    
     deps do
       require 'chef/knife/github_base'
       include Chef::Knife::GithubBase
       require 'chef/mixin/shell_out'
     end
       
-    banner "knife github create STRING (options)"
+    banner "knife github repo create <name> <description> (options)"
     category "github"
 
     option :github_token,
@@ -58,6 +68,8 @@ module KnifeGithubCreate
 
       # Get the name_args from the command line
       name = name_args.first
+      name_args.shift
+      desc = name_args.join(" ")
 
       # Get the organization name from config
       org = locate_config_value('github_organizations').first
@@ -66,7 +78,12 @@ module KnifeGithubCreate
         Chef::Log.error("Please specify a repository name")
         exit 1
       end 
-      
+       
+      if desc.nil? || desc.empty?
+        Chef::Log.error("Please specify a repository description")
+        exit 1
+      end
+
       if config[:github_user_repo]
         url = @github_url + "/api/" + @github_api_version + "/user/repos"
         Chef::Log.debug("Creating repository in user environment")
@@ -75,34 +92,73 @@ module KnifeGithubCreate
         Chef::Log.debug("Creating repository in organization: #{org}")
       end
 
+      @github_tmp = locate_config_value("github_tmp") || '/var/tmp/gitcreate'
+      @github_tmp = "#{@github_tmp}#{Process.pid}"
+
       # Get token information
       token = get_github_token()
 
       # Get body data for post
-      body = get_body_json(name)
+      body = get_body_json(name, desc)
 
-      # Creating the repository 
-      Chef::Log.debug("Creating the github repository")
-      repo = post_request(url, body, token)
+      # Creating the local repository or using existing one.
+      cookbook_dir = ""
+      cookbook_dir = get_cookbook_path(name)
 
-      Chef::Log.debug("Creating the local repository based on template")
-      create_cookbook(name)
+      if File.exists?(cookbook_dir)
+        Chef::Log.debug("Using local repository from #{cookbook_dir}")
 
-      cookbook_path = get_cookbook_path(name)
+        # Creating the github repository
+        Chef::Log.debug("Creating the github repository")
+        repo = post_request(url, body, token)
+        github_ssh_url = repo['ssh_url']
+    
+        Chef::Log.debug("Commit and push local repository")
+        # Initialize the local git repo
+        git_commit_and_push(cookbook_dir, github_ssh_url)
 
-      # Updating README.md if needed.
-      update_readme(cookbook_path)
+        puts "Finished creating #{name} and uploading #{cookbook_dir}"
+      else
+        Chef::Log.debug("Creating the local repository based on template")
+        create_cookbook(name, @github_tmp)
+  
+        cookbook_dir = File.join(@github_tmp, name)
+  
+        # Updating README.md if needed.
+        update_readme(cookbook_dir)
+   
+        # Updateing metadata.rb if needed.
+        update_metadata(cookbook_dir)
+  
+        # Creating the github repository
+        Chef::Log.debug("Creating the github repository")
+        repo = post_request(url, body, token)
+        github_ssh_url = repo['ssh_url']
+  
+        Chef::Log.debug("Commit and push local repository")      
+        # Initialize the local git repo
+        git_commit_and_push(cookbook_dir, github_ssh_url)
+  
+        Chef::Log.debug("Removing temp files")
+        FileUtils.remove_entry(@github_tmp)
+        puts "Finished creating and uploading #{name}"
+      end
+    end
  
-      # Updateing metadata.rb if needed.
-      update_metadata(cookbook_path)
-
-      github_ssh_url = repo['ssh_url']
-       
-      shell_out!("git init", :cwd => cookbook_path )
-      shell_out!("git add .", :cwd => cookbook_path ) 
-      shell_out!("git commit -m 'creating initial cookbook structure from the knife-github plugin' ", :cwd => cookbook_path ) 
-      shell_out!("git remote add origin #{github_ssh_url} ", :cwd => cookbook_path ) 
-      shell_out!("git push -u origin master", :cwd => cookbook_path ) 
+    # Set the username in README.md
+    # @param cookbook_path [String] cookbook path
+    #        github_ssh_url [String] github ssh url from repo
+    def git_commit_and_push(cookbook_path, github_ssh_url)
+      if File.exists?(File.join(cookbook_path, ".git"))
+        shell_out("git remote rm origin", :cwd => cookbook_path)
+      else  
+        shell_out!("git init", :cwd => cookbook_path)
+      end
+      shell_out!("echo - $(date): Uploaded with knife github plugin. >> CHANGELOG.md ", :cwd => cookbook_path)
+      shell_out!("git add .", :cwd => cookbook_path) 
+      shell_out!("git commit -m 'creating initial cookbook structure from the knife-github plugin' ", :cwd => cookbook_path) 
+      shell_out!("git remote add origin #{github_ssh_url} ", :cwd => cookbook_path) 
+      shell_out!("git push -u origin master", :cwd => cookbook_path) 
     end
 
     # Set the username in README.md
@@ -157,18 +213,20 @@ module KnifeGithubCreate
 
     # Create the cookbook template for upload
     # @param name [String] cookbook name
-    def create_cookbook(cookbook_name)
-      args = [ cookbook_name ]
+    #        tmp  [String] temp location
+    def create_cookbook(name, tmp)
+      args = [ name ]
       create = Chef::Knife::CookbookCreate.new(args)
+      create.config[:cookbook_path] = tmp
       create.run
     end
 
     # Create the json body with repo config for POST information
     # @param name [String] cookbook name  
-    def get_body_json(cookbook_name)
+    def get_body_json(cookbook_name, description="Please fill in the description.")
       body = {
         "name" => cookbook_name,
-        "description" => "We should ask for an description",
+        "description" => description,
         "private" => false,
         "has_issues" => true,
         "has_wiki" => true,

data/lib/chef/knife/github_repo_destroy.rb

@@ -0,0 +1,273 @@
+#
+# Author:: Sander Botman (<sbotman@schubergphilis.com>)
+# Copyright:: Copyright (c) 2013 Sander Botman.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife'
+
+module KnifeGithubRepoDestroy
+  class GithubRepoDestroy < Chef::Knife
+    # Implements the knife github repo destroy function
+    #
+    # == Overview
+    # The command will delete and destroy your repo on the github.
+    #
+    # === Examples
+    # Destroy a repository:
+    #    knife github repo destroy <name>
+    #
+    # === Options
+    # -t --github_token		Authentication token for the github.
+    # -U --github_user_repo	Destroy the cookbook in the user environment.
+    #
+    
+    deps do
+      require 'chef/knife/github_base'
+      include Chef::Knife::GithubBase
+      require 'chef/mixin/shell_out'
+    end
+      
+    banner "knife github repo destroy <name> (options)"
+    category "github"
+
+    option :github_token,
+           :short => "-t",
+           :long => "--github_token",
+           :description => "Your github token for OAuth authentication"
+
+    option :github_user_repo,
+           :short => "-U",
+           :long => "--github_user_repo",
+           :description => "Create the repo within your user environment",
+           :boolean => true
+
+    def run
+      extend Chef::Mixin::ShellOut
+
+      # validate base options from base module.
+      validate_base_options      
+
+      # Display information if debug mode is on.
+      display_debug_info
+
+      # Get the repo name from the command line
+      name = name_args.first
+
+      # Get the organization name from config
+      org = locate_config_value('github_organizations').first
+
+      if name.nil? || name.empty? 
+        Chef::Log.error("Please specify a repository name")
+        exit 1
+      end 
+       
+      user = get_userlogin
+
+      if config[:github_user_repo]
+        url = @github_url + "/api/" + @github_api_version + "/repos/#{user}/#{name}"
+        Chef::Log.debug("Destroying repository in user environment: #{user}")
+      else
+        url = @github_url + "/api/" + @github_api_version + "/repos/#{org}/#{name}"
+        Chef::Log.debug("Destroying repository in organization: #{org}")
+      end
+
+      # @github_tmp = locate_config_value("github_tmp") || '/var/tmp/gitcreate'
+      # @github_tmp = "#{@github_tmp}#{Process.pid}"
+
+      # Get token information
+      token = get_github_token()
+
+      # Get body data for post
+      # body = get_body_json(name, desc)
+
+      # Creating the local repository 
+      # Chef::Log.debug("Creating the local repository based on template")
+      # create_cookbook(name, @github_tmp)
+
+      # cookbook_path = File.join(@github_tmp, name)
+
+      # Updating README.md if needed.
+      # update_readme(cookbook_path)
+ 
+      # Updateing metadata.rb if needed.
+      # update_metadata(cookbook_path)
+
+      # Creating the github repository
+      repo = delete_request(url, token)
+      puts "Repo: #{name} is deleted" if repo.nil?
+
+      # github_ssh_url = repo['ssh_url']
+
+      # Chef::Log.debug("Commit and push local repository")      
+      # Initialize the local git repo
+      # git_commit_and_push(cookbook_path, github_ssh_url)
+
+      # Chef::Log.debug("Removing temp files")
+      # FileUtils.remove_entry(@github_tmp)
+    end
+ 
+    # Set the username in README.md
+    # @param cookbook_path [String] cookbook path
+    #        github_ssh_url [String] github ssh url from repo
+    def git_commit_and_push(cookbook_path, github_ssh_url)
+      shell_out!("git init", :cwd => cookbook_path )
+      shell_out!("git add .", :cwd => cookbook_path ) 
+      shell_out!("git commit -m 'creating initial cookbook structure from the knife-github plugin' ", :cwd => cookbook_path ) 
+      shell_out!("git remote add origin #{github_ssh_url} ", :cwd => cookbook_path ) 
+      shell_out!("git push -u origin master", :cwd => cookbook_path ) 
+    end
+
+    # Set the username in README.md
+    # @param name [String] cookbook path    
+    def update_readme(cookbook_path)
+      contents = ''
+      username = get_username
+      readme = File.join(cookbook_path, "README.md")
+      File.foreach(readme) do |line|
+        line.gsub!(/TODO: List authors/,"#{username}\n")
+        contents = contents << line
+      end
+      File.open(readme, 'w') {|f| f.write(contents) }
+      return nil
+    end
+
+    # Set the username and email in metadata.rb
+    # @param name [String] cookbook path 
+    def update_metadata(cookbook_path)
+      contents = ''
+      username = get_username
+      email    = get_useremail
+      metadata = File.join(cookbook_path, "metadata.rb")
+      File.foreach(metadata) do |line|
+        line.gsub!(/YOUR_COMPANY_NAME/,username) if username
+        line.gsub!(/YOUR_EMAIL/,email) if email
+        contents = contents << line
+      end
+      File.open(metadata, 'w') {|f| f.write(contents) }
+      return nil
+    end
+
+    # Get the username from passwd file or git config
+    # @param nil
+    def get_username()
+      username = ENV['USER']
+      passwd_user = %x(getent passwd #{username} | cut -d ':' -f 5).chomp
+      username = passwd_user if passwd_user
+      git_user_name = %x(git config user.name).strip
+      username = git_user_name if git_user_name
+      username
+    end
+
+    # Get the email from passwd file or git config
+    # @param nil
+    def get_useremail()
+      email = nil
+      git_user_email = %x(git config user.email).strip
+      email = git_user_email if git_user_email
+      email
+    end
+
+    # Get the email from passwd file or git config
+    # @param nil
+    def get_userlogin()
+      email = get_useremail()
+      unless email
+        puts "Cannot continue without login information. Please define the git email address."
+        exit 1
+      end
+      login = email.split('@').first
+    end
+
+
+    # Create the cookbook template for upload
+    # @param name [String] cookbook name
+    #        tmp  [String] temp location
+    def create_cookbook(name, tmp)
+      args = [ name ]
+      create = Chef::Knife::CookbookCreate.new(args)
+      create.config[:cookbook_path] = tmp
+      create.run
+    end
+
+    # Create the json body with repo config for POST information
+    # @param name [String] cookbook name  
+    def get_body_json()
+      body = {
+        "scopes" => ["public_repo"]
+      }.to_json
+    end
+
+    # Get the OAuth authentication token from config or command line
+    # @param nil
+    def get_github_token()
+      token = locate_config_value('github_token')
+      if token.nil? || token.empty?
+        Chef::Log.error("Cannot find any token information!")
+        Chef::Log.error("Please use: knife github token create")
+        exit 1
+      end
+      token
+    end
+
+    # Send DELETE command to API OAuth authentication token from config or command line
+    # @param url   [String] target url (organization or user) 
+    #        body  [JSON]   json data with repo configuration
+    #        token [String] token sring
+    def delete_request(url, token)
+
+      # if @github_ssl_verify_mode == "verify_none"
+      #   config[:ssl_verify_mode] = :verify_none
+      # elsif @github_ssl_verify_mode == "verify_peer"
+      #   config[:ssl_verify_mode] = :verify_peer
+      # end
+
+      Chef::Log.debug("URL: " + url.to_s)
+
+      uri = URI.parse(url)
+      http = Net::HTTP.new(uri.host,uri.port)
+      if uri.scheme == "https"
+        http.use_ssl = true
+        if @github_ssl_verify_mode == "verify_none"
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        else
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        end
+      end
+       
+      req = Net::HTTP::Delete.new(uri.path, initheader = {"Authorization" => "token #{token}"}) 
+      req.body = get_body_json()        
+      response = http.request(req)
+      
+      return nil if response.code == "204"
+
+      unless response.code == "201" then
+        puts "Error #{response.code}: #{response.message}"
+        puts JSON.pretty_generate(JSON.parse(response.body))
+        puts "URL: #{url}"
+        exit 1
+      end
+
+      begin
+        json = JSON.parse(response.body)
+      rescue
+        ui.warn "The result on the RESTRequest is not in json format"
+        ui.warn "Output: " + response.body
+        exit 1
+      end
+      json
+    end
+  end
+end

data/lib/chef/knife/github_search.rb

@@ -24,8 +24,6 @@ module KnifeGithubSearch
     deps do
       require 'chef/knife/github_base'
       include Chef::Knife::GithubBase
-      require 'chef/knife/github_baselist'
-      include Chef::Knife::GithubBaseList
     end
       
     banner "knife github search STRING (options)"
@@ -80,8 +78,7 @@ module KnifeGithubSearch
 
       url  = @github_url + "/api/" + @github_api_version + "/legacy/repos/search/" + query
       Chef::Log.debug("URL: #{url}")
-     
-      send_request(url)
+      connection.send_get_request(url, params = {}) 
     end
 
   end

data/lib/chef/knife/github_token_create.rb

@@ -0,0 +1,239 @@
+#
+# Author:: Sander Botman (<sbotman@schubergphilis.com>)
+# Copyright:: Copyright (c) 2013 Sander Botman.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife'
+
+module KnifeGithubTokenCreate
+  class GithubTokenCreate < Chef::Knife
+    # Implements the knife github token create function
+    #
+    # == Overview
+    # The command will create a authorization token in order to communicate with the github enterprise appliance.
+    #
+    # === Examples
+    # Create a new token:
+    #    knife github token create <username>
+    #
+    #   #  Deploy a release version of cookbook to your chef server
+    #   #     knife github deploy cookbook_name -f
+    #
+    # === Options
+    # -t --github_token		Authentication token for the github.
+    # -U --github_user_repo	Create the cookbook in the user environment.
+    #
+    
+    deps do
+      require 'knife-github/password'
+      require 'chef/knife/github_base'
+      include Chef::Knife::GithubBase
+      require 'chef/mixin/shell_out'
+    end
+      
+    banner "knife github token create <username> (options)"
+    category "github"
+
+    option :force,
+           :short => "-f",
+           :long => "--force",
+           :description => "Force token creation for OAuth authentication",
+           :boolean => true
+
+    option :github_user_repo,
+           :short => "-U",
+           :long => "--github_user_repo",
+           :description => "Create the repo within your user environment",
+           :boolean => true
+
+    def run
+      extend Chef::Mixin::ShellOut
+
+      # validate base options from base module.
+      validate_base_options      
+
+      # Display information if debug mode is on.
+      display_debug_info
+
+      # Get the name_args from the command line
+      username = name_args.first
+
+      # Get token information
+      token = get_github_token() unless config[:force]
+
+      # Create github token if needed
+      if token.nil?
+        token = validate_github_token(username)
+        update_knife_config(token)
+      end
+
+      puts "Finished updating your token. Using key:#{token}"
+    end
+ 
+    # Updates the knife configuration with the token information inside ~/.chef/knife.rb
+    # @param token [String] token key
+    # 
+    def update_knife_config(token)
+      contents = ''
+      update = false
+      config   = File.join(ENV["HOME"], ".chef/knife.rb")
+      File.foreach(config) do |line|
+        if line =~ /^\s*knife\[:github_token\].*/ && !token.nil?
+          Chef::Log.debug("Replacing current token with: #{token}")
+          contents = contents << "knife[:github_token] = \"#{token}\"\n"
+          update = true
+        else 
+          contents = contents << line
+        end
+      end
+      unless update
+        Chef::Log.debug("Updating configuration with token: #{token}")
+        contents = contents << "knife[:github_token] = \"#{token}\"\n"
+      end
+      File.open(config, 'w') {|f| f.write(contents) }
+      return true
+    end
+
+    # Get the OAuth authentication token from config or command line
+    # @param none
+    def get_github_token()
+      token = locate_config_value('github_token')
+      if token.nil? || token.empty? 
+        return nil
+      else
+        return token
+      end
+    end
+
+    # Validate the OAuth authentication token for the knife-github application.
+    # @param username   [String]        validates the token for specific user. (default is ENV['USER'])
+    #
+    def validate_github_token(username=nil)
+      params = {}
+      username = ENV["USER"] if username.nil?
+
+      params[:url] = @github_url + "/api/" + @github_api_version + "/authorizations"
+      Chef::Log.debug("Validating token information for user: #{username}.")
+
+      params[:username] = username
+      params[:password] = Github::Password.get( "Please enter github password for #{username} :" )
+      params[:action]   = "GET"
+
+      token_key = nil
+
+      result = send_request(params)
+      result.each do |token|
+        if token['app'] && token['app']['name'] == "knife-github (API)"
+          if token['scopes'].include?("delete_repo")
+            Chef::Log.debug("Found and using token: #{token_key}")
+            token_key = token['token']
+          else
+            Chef::Log.debug("Found token: #{token_key} but wrong scope, deleting token.")
+            params[:id] = token['id']
+            delete_github_token(params)
+          end
+        end
+      end
+
+      if token_key.nil?
+        result = create_github_token(params)
+        token_key = result['token']        
+      end
+
+      return token_key
+    end
+ 
+
+    # Create the OAuth authentication token for the knife-github application.
+    # @param params             [Hash]          Hash containing all options
+    #        params[:username]  [String]        Username if no token specified
+    #        params[:password]  [String]        Password if no token specified
+    #
+    def create_github_token(params)
+      Chef::Log.debug("Creating new application token for user: #{username}.")
+      params[:url]    = @github_url + "/api/" + @github_api_version + "/authorizations"
+      params[:body]   = '{"note":"knife-github","scopes":["delete_repo", "user", "public_repo", "repo", "gist"]"}'
+      params[:action] = "POST"
+      send_request(params)
+    end
+
+    def delete_github_token(params)
+      Chef::Log.debug("Deleting token id: #{params[':id']}")
+      params[:url]    = @github_url + "/api/" + @github_api_version + "/authorizations/#{params[:id]}"
+      params[:action] = "DELETE"
+      send_request(params)
+    end
+
+    # Post Get the OAuth authentication token from config or command line
+    # @param params		[Hash] 		Hash containing all options 
+    #        params[:url]	[String]	Url to target
+    #        params[:body]  	[JSON]   	json data for the request
+    #        params[:token]	[String] 	OAuth token
+    #        params[:username]	[String]	Username if no token specified
+    #        params[:password]  [String]	Password if no token specified
+    #
+    def send_request(params)
+      url = params[:url]
+      
+      Chef::Log.debug("URL: " + url.to_s)
+
+      uri = URI.parse(url)
+      http = Net::HTTP.new(uri.host,uri.port)
+      if uri.scheme == "https"
+        http.use_ssl = true
+        if  @github_ssl_verify_mode == "verify_none"
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        else
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        end
+      end
+
+      if params[:action] == "GET"
+        req = Net::HTTP::Get.new(uri.path)
+      elsif params[:action] == "POST"
+        req = Net::HTTP::Post.new(uri.path)
+      elsif params[:action] == "DELETE" 
+        req = Net::HTTP::Delete.new(uri.path)
+      end
+      
+      if params[:token].nil?
+        req.basic_auth params[:username], params[:password]
+      else
+        req.initheader = ({"Authorization" => "token #{params[:token]}"})
+      end
+      req.body = params[:body] if params[:body]
+      response = http.request(req)
+      
+      unless response.code =~ /^2../ then
+        puts "Error #{response.code}: #{response.message}"
+        puts JSON.pretty_generate(JSON.parse(response.body))
+        puts "URL: #{url}"
+        exit 1
+      end
+
+      return nil if response.body.nil? || response.body.empty?
+
+      begin
+        json = JSON.parse(response.body)
+      rescue
+        ui.warn "The result on the REST Request is not in json format"
+        ui.warn "Output: " + response.body
+        exit 1
+      end
+      json
+    end
+  end
+end

data/lib/knife-github/config.rb

@@ -6,6 +6,9 @@ module Github
       config_context :knife do
         configurable :github_url
         configurable :github_organizations
+        configurable :github_link
+        configurable :github_api_version
+        configurable :github_ssl_verify_mode
       end
   end
 end

data/lib/knife-github/password.rb

@@ -0,0 +1,85 @@
+require 'termios'
+
+module Github
+  class Password < String
+
+    # Turn local terminal echo on or off. This method is used for securing the
+    # display, so that a soon to be entered password will not be echoed to the
+    # screen. It is also used for restoring the display afterwards.
+    #
+    # If _masked_ is +true+, the keyboard is put into unbuffered mode, allowing
+    # the retrieval of characters one at a time. _masked_ has no effect when
+    # _on_ is +false+. You are unlikely to need this method in the course of
+    # normal operations.
+    #
+    def Password.echo(on=true, masked=false)
+      term = Termios::getattr( $stdin )
+  
+      if on
+        term.c_lflag |= ( Termios::ECHO | Termios::ICANON )
+      else # off
+        term.c_lflag &= ~Termios::ECHO
+        term.c_lflag &= ~Termios::ICANON if masked
+      end
+  
+      Termios::setattr( $stdin, Termios::TCSANOW, term )
+    end
+  
+  
+    # Get a password from _STDIN_, using buffered line input and displaying
+    # _message_ as the prompt. No output will appear while the password is being
+    # typed. Hitting <b>[Enter]</b> completes password entry. If _STDIN_ is not
+    # connected to a tty, no prompt will be displayed.
+    #
+    def Password.get(message="Password: ")
+      begin
+        if $stdin.tty?
+  	Password.echo false
+  	print message if message
+        end
+  
+        pw = Password.new( $stdin.gets || "" )
+        pw.chomp!
+  
+      ensure
+        if $stdin.tty?
+  	Password.echo true
+  	print "\n"
+        end
+      end
+    end
+  
+  
+    # Get a password from _STDIN_ in unbuffered mode, i.e. one key at a time.
+    # _message_ will be displayed as the prompt and each key press with echo
+    # _mask_ to the terminal. There is no need to hit <b>[Enter]</b> at the end.
+    #
+    def Password.getc(message="Password: ", mask='*')
+      # Save current buffering mode
+      buffering = $stdout.sync
+  
+      # Turn off buffering
+      $stdout.sync = true
+  
+      begin
+        Password.echo(false, true)
+        print message if message
+        pw = ""
+  
+        while ( char = $stdin.getc ) != 10 # break after [Enter]
+  	putc mask
+  	pw << char
+        end
+  
+      ensure
+        Password.echo true
+        print "\n"
+      end
+  
+      # Restore original buffering mode
+      $stdout.sync = buffering
+  
+      Password.new( pw )
+    end
+  end
+end

data/lib/knife-github/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Github
-    VERSION = "0.0.9"
+    VERSION = "0.1.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-github
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-versioning
@@ -28,6 +28,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: ruby-termios
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.6
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -91,14 +107,17 @@ files:
 - lib/chef/knife/github_cleanup.rb
 - lib/chef/knife/github_clone.rb
 - lib/chef/knife/github_compare.rb
-- lib/chef/knife/github_create.rb
 - lib/chef/knife/github_deploy.rb
 - lib/chef/knife/github_diff.rb
 - lib/chef/knife/github_list.rb
 - lib/chef/knife/github_pin.rb
+- lib/chef/knife/github_repo_create.rb
+- lib/chef/knife/github_repo_destroy.rb
 - lib/chef/knife/github_search.rb
+- lib/chef/knife/github_token_create.rb
 - lib/knife-github/config.rb
 - lib/knife-github/connection.rb
+- lib/knife-github/password.rb
 - lib/knife-github/repo.rb
 - lib/knife-github/version.rb
 homepage: https://github.com/schubergphilis/knife-github