knife-github 0.1.3 → 0.1.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDViMjMxNGQzYTkxODBmMzM2MTI2ZjVkYmFkNmRmNjMyNjEzZjE2MA==
+  data.tar.gz: !binary |-
+    NDk3NTRkOTc1MjYxMzZiZDhlNWJmZThlM2ZlNDNiZDg2MzcxZDBkMw==
+SHA512:
+  metadata.gz: !binary |-
+    N2ZkMTM5OGIxNTRiNDkyMGY2YWMyY2E4NjYxYmU3ZGMyN2FkZWI5YThhYmE3
+    MGE4YjhiODIzYTg4ZWE4OTM0NGIzOGY1MGI0NWQ0MjY1MzkwZWM4N2NmMjFk
+    YWIzY2Y3ODY2ZjhhNDNlMjQzMzRmYjc3Mzg4ZGU3ZGRiODEwMzI=
+  data.tar.gz: !binary |-
+    ODllMmI5OTRhNDlhYTNkM2MwNmQ5ODIwNmJjZGZiYjE5MThmY2EwMmRkMDIy
+    NzJjNDVkNDk3MGM5YjIzYjZmN2I3ZTdiMjQ4N2JmNjIwMTdhMjliZTllZjFm
+    Y2EwZDNkMDJhMzk4NTQ2MWI4YjdjMGRiMTcyNjMwY2JkOWVkOTY=

data/knife-github.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |s|
   s.executables       = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths     = ["lib"]
   s.license           = 'Apache 2.0'
-  s.add_dependency "mixlib-versioning", ">= 1.0.0"
-  s.add_dependency "highline", ">= 1.6.19"
-  s.add_dependency "chef", ">= 10.0.0"
+  s.add_dependency 'mixlib-versioning', '>= 1.0.0'
+  s.add_dependency 'highline', '>= 1.6.19'
+  s.add_dependency 'rb-readline', '~> 0.5.1'
+  s.add_dependency 'chef', '>= 10.0.0'
 end

data/lib/chef/knife/github_repo_create.rb

@@ -41,6 +41,7 @@ module KnifeGithubRepoCreate
       require 'chef/knife/github_base'
       include Chef::Knife::GithubBase
       require 'chef/mixin/shell_out'
+      require 'readline'
     end
       
     banner "knife github repo create <name> <description> (options)"
@@ -69,7 +70,6 @@ module KnifeGithubRepoCreate
       # 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
@@ -79,10 +79,8 @@ module KnifeGithubRepoCreate
         exit 1
       end 
        
-      if desc.nil? || desc.empty?
-        Chef::Log.error("Please specify a repository description")
-        exit 1
-      end
+      desc = get_repo_description
+      type = get_repo_type
 
       if config[:github_user_repo]
         url = @github_url + "/api/" + @github_api_version + "/user/repos"
@@ -102,8 +100,7 @@ module KnifeGithubRepoCreate
       body = get_body_json(name, desc)
 
       # Creating the local repository or using existing one.
-      cookbook_dir = ""
-      cookbook_dir = get_cookbook_path(name)
+      cookbook_dir = get_cookbook_path(name) || ""
 
       if File.exists?(cookbook_dir)
         Chef::Log.debug("Using local repository from #{cookbook_dir}")
@@ -119,16 +116,13 @@ module KnifeGithubRepoCreate
 
         puts "Finished creating #{name} and uploading #{cookbook_dir}"
       else
-        Chef::Log.debug("Creating the local repository based on template")
-        create_cookbook(name, @github_tmp)
+        Chef::Log.debug("Creating the repository based on #{type} template")
+        create_cookbook(name, type, @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)
+        # Updateing template information if needed.
+        update_template_files(name, cookbook_dir, desc)
   
         # Creating the github repository
         Chef::Log.debug("Creating the github repository")
@@ -144,7 +138,56 @@ module KnifeGithubRepoCreate
         puts "Finished creating and uploading #{name}"
       end
     end
+
  
+    # User selection on repo description
+    # @return [string]
+    def get_repo_description
+      question = "\nPlease enter a description for the repository: "
+
+      desc = input question
+      if desc.nil? || desc.empty?
+        Chef::Log.error("Please enter a repository description")
+        get_repo_description
+      end
+      desc
+    end
+
+    # User selection on repo type 
+    # @return [string]
+    def get_repo_type
+      question = "\nPlease select the repository type that you want to create.\n"
+      question += "  1 - Empty\n"
+      question += "  2 - Cookbook Application\n"
+      question += "  3 - Cookbook Wrapper\n"
+      question += "  4 - Cookbook Role\n"
+      question += "Type: "
+
+      type = input question
+      case type
+        when '1'
+          return 'empty'
+        when '2'
+          return "application"
+        when '3'
+          return "wrapper"
+        when '4'
+          return "role"
+        else
+          Chef::Log.error("Please select 1-4 to continue.")
+          get_repo_type
+      end
+    end
+
+    # Read the commandline input and return the input
+    # @param prompt [String] info to prompt to user
+ 
+   $stdout.sync = false
+    def input(prompt="", newline=true)
+      prompt += "\n" if newline
+      Readline.readline(prompt).squeeze(" ").strip
+    end
+
     # Set the username in README.md
     # @param cookbook_path [String] cookbook path
     #        github_ssh_url [String] github ssh url from repo
@@ -161,33 +204,29 @@ module KnifeGithubRepoCreate
       shell_out!("git push -u origin master", :cwd => cookbook_path) 
     end
 
-    # Set the username in README.md
+    # Update all template files with the right information
     # @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
+    def update_template_files(name, cookbook_path, description)
+      files = Dir.glob("#{cookbook_path}/**/*").select{ |e| File.file? e }
+      user    = get_username || "Your Name" 
+      email   = get_useremail || "Your Email"
+      company = "Schuberg Philis"
+      year    = Time.now.year
+      date    = Time.now
+      files.each do |file|
+        contents = ""
+        File.foreach(file) do |line|
+          line.gsub!(/DESCRIPTION/, description)
+          line.gsub!(/COOKBOOK/, name)
+          line.gsub!(/COMPANY/, company)
+          line.gsub!(/NAME/, user)
+          line.gsub!(/EMAIL/, email)
+          line.gsub!(/YEAR/, year.to_s)
+          line.gsub!(/DATE/, date.to_s)
+          contents += line
+        end
+        File.open(file, 'w') {|f| f.write(contents) }
       end
-      File.open(metadata, 'w') {|f| f.write(contents) }
       return nil
     end
 
@@ -213,12 +252,21 @@ module KnifeGithubRepoCreate
 
     # Create the cookbook template for upload
     # @param name [String] cookbook name
+    #        type [String] type of cookbook
     #        tmp  [String] temp location
-    def create_cookbook(name, tmp)
-      args = [ name ]
-      create = Chef::Knife::CookbookCreate.new(args)
-      create.config[:cookbook_path] = tmp
-      create.run
+    def create_cookbook(name, type, tmp)
+      target = File.join(tmp, name)
+      template_org = locate_config_value("github_template_org")
+      if template_org.nil? || template_org.empty?
+        Chef::Log.fatal("Cannot find github_template_org within your configuration")  
+      else
+
+        github_url = @github_url.gsub('http://', 'git://') if @github_url =~ /^http:\/\/.*$/
+        github_url = @github_url.gsub('https://', 'git://') if @github_url =~ /^https:\/\/.*$/
+ 
+        template_path = File.join(github_url, template_org, "chef_template_#{type}.git") 
+        shell_out!("git clone #{template_path} #{target}") # , :cwd => cookbook_path)
+      end
     end
 
     # Create the json body with repo config for POST information

data/lib/knife-github/version.rb

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-github
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.1.4
 platform: ruby
 authors:
 - Sander Botman
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-versioning
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -39,15 +35,27 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.19
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,7 +63,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -123,27 +130,25 @@ files:
 homepage: https://github.com/schubergphilis/knife-github
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Github interaction support for chef's knife cli tool
 test_files: []
-has_rdoc: false