knife-table 0.0.2 → 0.0.3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.0.3
+* Add foodcritic support
+* Add knife config support
+* Add hub integration
+* Add order command
+
 ## v0.0.2
 * Load data bag via DataBagItem class not DataBag
 

data/README.md

@@ -1,18 +1,20 @@
-# ChefTable
+# KnifeTable
 
-ChefTable is a knife plugin to aid in cookbook development
+KnifeTable is a knife plugin to aid in cookbook development
 workflow. Its intention is to help automate versioning
 within environments and cookbook freezing based on a stable
-branch. Building off of the knife-spork plugin ChefTable
+branch. Building off of the knife-spork plugin KnifeTable
 helps to provide consistency within the environment.
 
 
 ## Usage
 
-Currently, two helpers are available:
+Currently, the supported workflow is as follows:
 
 `knife table set`
 
+`knife table order`
+
 and 
 
 `knife table serve`
@@ -25,13 +27,22 @@ of what is being added:
 
 `knife table set new feature`
 
-This will create a new working branch named 'WIP-new_feature'. The prefix
-for the branch defaults to 'WIP-' but can be modified using the `-p` option.
-If it is known what cookbooks will be modified, you can provide them while
-setting:
+This will create a new working branch named 'new_feature'. A default prefix
+can be added the branch name via the `-p` option. If it is known what cookbooks 
+will be modified, you can provide them while setting:
 
 `knife table set -c iptables,mysql new feature`
 
+### Order
+
+Once the code has been updated, tested and is ready for review, the order
+can be placed which will create a new pull request:
+
+`knife table order`
+
+The order option will also optionally run foodcritic and require a passing
+result before proceeding with the pull request generation.
+
 ### Service
 
 Service works on the assumption that any new code into the stable branch (master

data/knife-table.gemspec

@@ -1,6 +1,8 @@
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__)) + '/lib/'
+require 'knife-table/version'
 Gem::Specification.new do |s|
   s.name = 'knife-table'
-  s.version = '0.0.2'
+  s.version = KnifeTable::VERSION.version
   s.summary = 'Help chef set and serve the table'
   s.author = 'Chris Roberts'
   s.email = 'chrisroberts.code@gmail.com'
@@ -8,5 +10,7 @@ Gem::Specification.new do |s|
   s.description = "Chef's table"
   s.require_path = 'lib'
   s.files = Dir.glob('**/*')
-  s.add_dependency 'knife-spork'
+  s.add_dependency 'knife-spork', '>= 0.1.11'
+  s.add_dependency 'hub', '>= 1.10.1'
+  s.add_dependency 'foodcritic', '>= 1.4.0'
 end

data/lib/chef/knife/table_clear.rb

@@ -13,7 +13,7 @@ module KnifeTable
     banner 'knife table clear'
 
     def run
-
+      ui.fatal "Not currently supported"
     end
 
   end

data/lib/chef/knife/table_order.rb

@@ -0,0 +1,154 @@
+require 'open3'
+require 'knife-table/helpers'
+
+module KnifeTable
+  class TableOrder < Chef::Knife
+
+    include KnifeTable::Helpers
+
+    deps do
+      require 'git'
+      require 'hub'
+    end
+
+    banner 'knife table order [BRANCH]'
+
+    option :upstream_user,
+      :short => '-u USER',
+      :long => '--upstream-user USER',
+      :description => 'Username for upstream github account'
+
+    option :upstream_branch,
+      :short => '-b BRANCH',
+      :long => '--upstream-branch BRANCH',
+      :description => 'Upstream branch name'
+
+    option :title,
+      :short => '-t TITLE',
+      :long => '--title TITLE',
+      :description => 'Title for pull request'
+
+    option :foodcritic,
+      :short => '-f',
+      :long => '--foodcritic',
+      :description => 'Pass foodcritic before generating pull request',
+      :boolean => true
+
+    option :foodcritic_fail_on,
+      :short => '-x correctness,any,~FC014',
+      :long => '--foodcritic-fail-on correctness,any,~FC014',
+      :description => 'Set what foodcritic should fail on',
+      :proc => lambda{|v| v.split(',').strip}
+
+
+    def run
+      ui.msg ui.highline.color("#{' ' * 10}** Knife Table: Placing Order  **", [HighLine::GREEN, HighLine::BOLD])
+      check_config_options
+      if(config[:foodcritic])
+        fail_on = Array(config[:foodcritic_fail_on]).map{|s| "-f #{s}"}.join(' ')
+        cookbooks = discover_changed(:cookbooks, 'master', 'HEAD').map{|c| c.split('/').first}
+        pass = true
+        cookbooks.each do |cookbook|
+          res = system("foodcritic #{fail_on} #{File.join(cookbook_path, cookbook)}")
+          pass = res unless res
+        end
+        unless(pass)
+          ui.fatal "Modifications do not currently pass foodcritic!"
+          exit 1
+        end
+      end
+
+      # TODO: Update this to not shell out
+      cmd = "hub pull-request \"#{title}\" -b #{@upstream}:#{config[:upstream_branch]} -h #{local_user}:#{local_branch}"
+      output = ''
+      err = nil
+      unless(File.exists?(File.join(ENV['HOME'], '.config', 'hub')))
+        g_config = Hub::GitHubAPI::Configuration.new(nil)
+        g_user = g_config.prompt 'Github username'
+        g_pass = g_config.prompt_password 'Github', g_user
+      end
+      res = Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
+        if(g_user)
+          stdin.puts g_user
+          stdin.puts g_pass
+        end
+        output << stdout.readlines.last.to_s
+        err = stderr.readlines.last.to_s
+        wait_thr.value
+      end
+      output.strip!
+      if(res.success?)
+        ui.msg "New pull request: #{output}"
+      else
+        ui.error err.to_s.empty? ? 'Failed to create pull request' : err
+      end
+    end
+
+    private
+
+    def title
+      config[:title] || local_branch.gsub('_', ' ')
+    end
+
+    def local_branch
+      unless(@branch)
+        if(name_args.size > 0)
+          @branch = name_args.first
+        else
+          @branch = git.current_branch
+        end
+      end
+      @branch
+    end
+
+    def local_user
+      unless(@local)
+        l = %x{git remote -v}.split("\n").find_all{|r|
+          r.include?('github.com')
+        }.map{|r|
+          Array(r.scan(%r{:[^/]+}).first).first
+        }.compact.map{|r|
+          r.sub(':', '')
+        }.uniq.sort - [@upstream]
+        if(l.size > 1)
+          @local = ask_user_local(l)
+        elsif(l.size < 1)
+          @local = @upstream
+        else
+          @local = l.first
+        end
+      end
+      @local
+    end
+
+    def ask_user_local(locals)
+      l = nil
+      ui.msg 'Please select your local user:'
+      while(l.nil?)
+        locals.each_with_index do |name, idx|
+          ui.msg "#{idx + 1}. #{name}"
+        end
+        res = ui.ask_question "Enter number of local user [1-#{local.size}]:"
+        if(locals[res.to_i + 1])
+          l = locals[res.to_i + 1]
+        else
+          ui.warn "Invalid selection."
+        end
+      end
+      l
+    end
+
+    def check_config_options
+      %w(upstream_user upstream_branch title foodcritic foodcritic_fail_on).each do |key|
+        config[key.to_sym] ||= Chef::Config["table_set_#{key}".to_sym]
+      end
+      @upstream = config[:upstream_user]
+      unless(@upstream)
+        ui.fatal "Upstream user is REQUIRED"
+        exit 1
+      end
+      config[:foodcritic_fail_on] ||= 'correctness'
+      config[:upstream_branch] ||= 'master'
+    end
+  end
+end

data/lib/chef/knife/table_serve.rb

@@ -32,13 +32,11 @@ module KnifeTable
     option :git_branch,
       :short => '-b BRANCH',
       :long => '--git-branch BRANCH',
-      :default => 'master',
       :description => 'Set working branch'
 
     option :git_remote_name,
       :short => '-r NAME',
       :long => '--git-remote-name NAME',
-      :default => 'origin',
       :description => 'Remote repo name'
 
     option :git_autocommit,
@@ -65,19 +63,15 @@ module KnifeTable
       :boolean => true,
       :description => 'Upload any changed data bags'
 
-    def initialize(*args)
-      super
-      @environments = config[:environments].to_s.split(",").map(&:strip)
-    end
-
     def run
+      check_config_options
       sanity_checks
       cookbooks = discover_changed(:cookbooks, *determine_commit_span).map{|c|c.split('/').first}
       roles = discover_changed(:roles, *determine_commit_span) if config[:upload_roles]
       data_bags = discover_changed(:data_bags, *determine_commit_span) if config[:upload_data_bags]
 
       ui.msg ui.highline.color("#{' ' * 10}** Knife Table: Service started  **", [HighLine::GREEN, HighLine::BOLD])
-      ui.highline.say ui.highline.color("Discovered cookbooks staged for freeze: #{cookbooks.join(', ')}", HighLine::CYAN)
+      ui.highline.say ui.highline.color("Discovered cookbooks staged for freeze: #{cookbooks.join(', ')}", HighLine::CYAN) unless cookbooks.nil? || cookbooks.empty?
       ui.highline.say ui.highline.color("Environments staged to be updated: #{@environments.join(', ')}", HighLine::CYAN) unless @environments.empty?
       ui.highline.say ui.highline.color("Roles staged to be uploaded: #{roles.sort.map{|r|r.sub(/\.(rb|json)/, '')}.join(', ')}", HighLine::CYAN) unless roles.nil? || roles.empty?
       ui.highline.say ui.highline.color("Data Bags staged to be uploaded: #{data_bags.sort.join(', ')}", HighLine::CYAN) unless data_bags.nil? || data_bags.empty?
@@ -224,6 +218,7 @@ module KnifeTable
     def upload_roles(role)
       role_load = loader(:roles).load_from('roles', role)
       role_load.save
+      role_load
     end
 
     def upload_data_bags(bag)
@@ -232,6 +227,7 @@ module KnifeTable
       dbag.data_bag(bag.split('/').first)
       dbag.raw_data = data_bag_load
       dbag.save
+      dbag
     end
 
     private
@@ -297,23 +293,13 @@ module KnifeTable
       end
     end
 
-    def discover_changed(type, first_commit, last_commit)
-      changed = []
-      git.diff(first_commit, last_commit).stats[:files].keys.each do |path|
-        if(path.start_with?(type.to_s))
-          changed << path.sub(/^#{type.to_s}\/?/, '')
-        end
-      end
-      changed.uniq
-    end
-
     def upload_changes(type, changed)
       raise "Unsupported upload change type: #{type}" unless [:roles, :data_bags].include?(type.to_sym)
       ui.highline.say "#{ui.highline.color("Uploading #{type.to_s.gsub('_', ' ')}:", HighLine::GREEN)} "
       unless(changed.empty?)
         changed.each do |item|
-          send("upload_#{type}", item)
-          ui.highline.say "#{File.basename(item).sub(/\.(rb|json)/, '')} "
+          thing = send("upload_#{type}", item)
+          ui.highline.say "#{thing.is_a?(Chef::Role) ? thing.name : "#{thing.data_bag}::#{thing.id}"} "
         end
       else
         ui.highline.say "no #{type.to_s.gsub('_', ' ').sub(/s$/, '')} changes detected "
@@ -331,5 +317,14 @@ module KnifeTable
       end
     end
 
+    def check_config_options
+      %w(environments git_autopush git_tag git_branch git_remote_name 
+        git_autocommit autoproceed upload_roles upload_data_bags).each do |key|
+        config[key.to_sym] ||= Chef::Config["table_set_#{key}".to_sym]
+      end
+      @environments = config[:environments].to_s.split(",").map(&:strip)
+      config[:git_branch] ||= 'master'
+      config[:git_remote_name] ||= 'origin'
+    end
   end
 end

data/lib/chef/knife/table_set.rb

@@ -20,23 +20,24 @@ module KnifeTable
     option :branch_prefix,
       :short => '-p PREFIX',
       :long => '--branch-prefix PREFIX',
-      :description => 'Set prefix for branch name',
-      :default => 'WIP-'
+      :description => 'Set prefix for branch name'
 
     option :bump_type,
       :short => '-b TYPE',
       :long => '--bump-type TYPE',
-      :description => 'Type of version bump (major, minor, patch)',
-      :default => 'patch'
-
-    def initialize(*args)
-      super
-      @cookbooks = config[:cookbooks].to_s.split(',').map(&:strip)
-    end
+      :description => 'Type of version bump (major, minor, patch)'
 
     def run
       ui.msg ui.highline.color("#{' ' * 10}** Knife Table: New place setting  **", [HighLine::GREEN, HighLine::BOLD])
+      if(name_args.empty?)
+        ui.fatal "Feature description must be provided"
+        exit 1
+      end
+      check_config_options
+      check_current_branch!
+      check_up_to_date!
       branch_name = "#{config[:branch_prefix]}#{name_args.join('_').downcase}"
+      check_branch_conflict!(branch_name)
       ui.highline.say "Creating new work branch (#{branch_name}): "
       git.branch(branch_name).create
       ui.highline.say "done"
@@ -50,5 +51,36 @@ module KnifeTable
       end
     end
 
+    private
+
+    def check_current_branch!
+      unless(git.current_branch == 'master')
+        ui.fatal "Set requires master branch to be checked out. Currently on: #{git.current_branch}"
+        exit 1
+      end
+    end
+
+    def check_branch_conflict!(name)
+      conflict = git.branches.map(&:full).detect do |b|
+        b == name || b.sub(%r{remotes/[^/]+/}, '') == name
+      end
+      if(conflict)
+        ui.fatal "Failed to create topic branch. Already exists: #{conflict}"
+        exit 1
+      end
+    end
+
+    def check_up_to_date!
+      # TODO: fetch/merge master to ensure up to date?
+    end
+
+    def check_config_options
+      %w(cookbooks branch_prefix bump_type).each do |key|
+        config[key.to_sym] ||= Chef::Config["table_set_#{key}".to_sym]
+      end
+      @cookbooks = config[:cookbooks].to_s.split(',').map(&:strip)
+      config[:bump_type] ||= 'patch'
+    end
+
   end
 end

data/lib/knife-table/helpers.rb

@@ -7,5 +7,15 @@ module KnifeTable
     def cookbook_path
       Chef::Config[:cookbook_path].first
     end
+
+    def discover_changed(type, first_commit, last_commit)
+      changed = []
+      git.diff(first_commit, last_commit).stats[:files].keys.each do |path|
+        if(path.start_with?(type.to_s))
+          changed << path.sub(/^#{type.to_s}\/?/, '')
+        end
+      end
+      changed.uniq
+    end
   end
 end

data/lib/knife-table/version.rb

@@ -1,3 +1,5 @@
 module KnifeTable
-  VERSION = '0.0.2'
+  class Version < Gem::Version
+  end
+  VERSION = Version.new('0.0.3')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-table
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,32 +9,54 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-spork
-  requirement: &20490380 !ruby/object:Gem::Requirement
+  requirement: &5700840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.11
   type: :runtime
   prerelease: false
-  version_requirements: *20490380
+  version_requirements: *5700840
+- !ruby/object:Gem::Dependency
+  name: hub
+  requirement: &5716660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.10.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *5716660
+- !ruby/object:Gem::Dependency
+  name: foodcritic
+  requirement: &5716120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *5716120
 description: Chef's table
 email: chrisroberts.code@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- knife-table-0.0.3.gem
 - CHANGELOG.md
-- knife-table-0.0.2.gem
 - README.md
 - knife-table.gemspec
 - lib/knife-table/version.rb
 - lib/knife-table/helpers.rb
-- lib/chef/knife/data_holder.rb
+- lib/chef/knife/table_order.rb
 - lib/chef/knife/table_serve.rb
 - lib/chef/knife/table_clear.rb
 - lib/chef/knife/table_set.rb

data/lib/chef/knife/data_holder.rb

@@ -1,54 +0,0 @@
-require 'pp'
-
-class DataHolder
-
-  def initialize
-    @holder = {}
-    @path = nil
-  end
-
-  def method_missing(name, *args)
-    @holder[name] = args
-  end
-
-  def ==(holder)
-    raise TypeError.new('Comparisons only allowed between DataHolder instances')
-    self._holder == holder._holder
-  end
-
-  def _holder
-    @holder
-  end
-
-  def _load(path)
-    @path = path
-    self.instance_eval(
-      File.read(path)
-    )
-    self
-  end
-
-  def _output
-    output = ''
-    @holder.each_pair do |k,v|
-      output << "#{k}(\n"
-      inards = []
-      v.each do |item|
-        s = ''
-        PP.pp(item, s)
-        inards << s
-      end
-      output << inards.join(",\n")
-      output << ")\n"
-    end
-    output
-    File.open(@path, 'w') do |file|
-      file.write(output)
-    end
-    output
-  end
-
-  def _path
-    @path
-  end
-end