barkeep-client 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -0,0 +1,18 @@
+PATH
+  remote: .
+  specs:
+    barkeep-client (0.0.2)
+      dedent (~> 0.0.2)
+      trollop (~> 1.16.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    dedent (0.0.2)
+    trollop (1.16.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  barkeep-client!

data/barkeep_client.gemspec

@@ -1,13 +1,14 @@
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "barkeep-client"
-  s.version     = "0.0.2"
+  s.version     = "0.0.3"
   s.authors     = ["Caleb Spare"]
   s.email       = ["caleb@ooyala.com"]
-  s.homepage    = ""
-  s.summary     = %q{Who is the barkeep?}
-  s.description = %q{Who is the barkeep?}
+  s.homepage    = "https://github.com/ooyala/barkeep"
+  s.summary     = %q{Barkeep command-line client}
+  s.description = %q{A command-line client for Barkeep's REST API.}
 
   s.rubyforge_project = "barkeep-client"
 
@@ -16,7 +17,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
+  s.add_dependency "trollop", "~> 1.16.2"
+  s.add_dependency "dedent", "~> 0.0.2"
 end

data/bin/barkeep

@@ -1,12 +1,53 @@
 #!/usr/bin/env ruby
 
-puts <<-'EOS'
-          _             _       _   _            _                _                  ___
-         | |           (_)     | | | |          | |              | |                |__ \
-__      _| |__   ___    _ ___  | |_| |__   ___  | |__   __ _ _ __| | _____  ___ _ __   ) |
-\ \ /\ / / '_ \ / _ \  | / __| | __| '_ \ / _ \ | '_ \ / _` | '__| |/ / _ \/ _ \ '_ \ / /
- \ V  V /| | | | (_) | | \__ \ | |_| | | |  __/ | |_) | (_| | |  |   <  __/  __/ |_) |_|
-  \_/\_/ |_| |_|\___/  |_|___/  \__|_| |_|\___| |_.__/ \__,_|_|  |_|\_\___|\___| .__/(_)
-                                                                               | |
-                                                                               |_|
-EOS
+require "rubygems"
+require "dedent"
+require "yaml"
+
+require "barkeep/commit"
+require "barkeep/unapproved"
+
+CONFIG_FILE = File.join(ENV["HOME"], ".barkeeprc")
+
+COMMANDS = {
+  "commit" => "Get information about a particular commit.",
+  "unapproved" => "Find unapproved commits from a list or commit range."
+}
+
+sub_command = ARGV.shift
+unless COMMANDS.include? sub_command
+  puts sub_command ? "Error: unrecognized command '#{sub_command}'" : "Error: must provide command."
+  puts <<-EOS.dedent
+
+    Usage:
+        $ barkeep <command> [args]
+    where <command> is one of:
+  EOS
+  COMMANDS.each { |command, purpose| puts "    #{command.rjust(COMMANDS.keys.map(&:size).max)} | #{purpose}" }
+  puts <<-EOS.dedent
+
+    Type 'barkeep <command> --help' for more information about a particular command."
+  EOS
+  exit 1
+end
+
+# Load in configuration from ~/.barkeeprc.
+begin
+  configuration = YAML.load_file CONFIG_FILE
+rescue
+  puts <<-EOS.dedent
+    Error: #{CONFIG_FILE} must exist to specify barkeep server information, and it must be a valid YAML file.
+  EOS
+  exit 1
+end
+
+# Check the configuration
+REQUIRED_KEYS = %w[barkeep_server]
+unless REQUIRED_KEYS.each { |key| configuration.include? key }
+  puts "Error: each of the following configuration keys are required in your #{CONFIG_FILE}:"
+  REQUIRED_KEYS.each { |key| puts "  #{key}" }
+  exit 1
+end
+
+# Delegate to the trollop parsing + client logic that lives in the appropriate subcommand file.
+BarkeepClient.send sub_command.to_sym, configuration

data/lib/barkeep/commit.rb

@@ -0,0 +1,47 @@
+require "rubygems"
+require "trollop"
+require "dedent"
+require "net/http"
+require "json"
+
+require "barkeep/constants"
+
+module BarkeepClient
+  def self.commit(configuration)
+    options = Trollop::options do
+      banner <<-EOS.dedent
+        Barkeep's 'commit' command shows information about a particular commit.
+
+        Usage:
+            $ barkeep commit [options] <commit>
+        where <commit> is specified as a (partial) SHA-1 hash (for the current repo) or as, for example,
+            myrepo/d29a4a0fa
+        to specify a particular repository, and [options] can include:
+      EOS
+    end
+    Trollop::die "must provide a commit sha" unless ARGV.size == 1
+
+    commit = ARGV[0]
+    repo, sha = case commit
+                when %r{^[^/]+/#{SHA_REGEX}$} # foo/abc123
+                  commit.split "/"
+                when /^#{SHA_REGEX}$/ # abc123
+                  repo = File.basename(`git rev-parse --show-toplevel`).strip
+                  if repo.empty?
+                    Trollop::die "need to be in a git repo or specify a repository (e.g. myrepo/abc123)"
+                  end
+                  [repo, commit]
+                else
+                  Trollop::die "#{commit} is an invalid commit specification"
+                end
+    uri = URI.parse(File.join(configuration["barkeep_server"], "/api/commits/#{repo}/#{sha}"))
+    result = Net::HTTP.get_response uri
+    if result.code.to_i != 200
+      error = JSON.parse(result.body)["message"] rescue nil
+      puts error ? "Error: #{error}" : "Unspecified server error."
+      exit 1
+    end
+    info = JSON.parse(result.body)
+    info.each { |key, value| puts "  #{key.rjust(info.keys.map(&:size).max)}: #{value}" }
+  end
+end

data/lib/barkeep/constants.rb

@@ -0,0 +1,3 @@
+module BarkeepClient
+  SHA_REGEX = /[0-9a-fA-F]+/
+end

data/lib/barkeep/unapproved.rb

@@ -0,0 +1,81 @@
+require "rubygems"
+require "trollop"
+require "dedent"
+require "net/http"
+require "json"
+
+require "barkeep/constants"
+
+module BarkeepClient
+  def self.unapproved(configuration)
+    options = Trollop::options do
+      banner <<-EOS.dedent
+        Barkeep's 'unapproved' command shows information about a particular commit. It MUST be run from a git
+        repository of the same name as the repository on the server.
+
+        Usage:
+            $ barkeep unapproved [options] <commit-range>
+        where <commit-range> is a single git SHA or a commit range specified using git's '..' syntax.
+        For example:
+
+            $ barkeep unapproved abc123
+            $ barkeep unapproved abc123..def456
+
+        [options] can include:
+      EOS
+      opt :stop_on_unapproved, "Stop and print a message on the first unapproved commit."
+    end
+    Trollop::die "must provide a commit range" unless ARGV.size == 1
+
+    repo = File.basename(`git rev-parse --show-toplevel`).strip
+    if repo.empty?
+      Trollop::die "need to be in a git repo"
+    end
+
+    commit_range = ARGV[0]
+    case commit_range
+    when /^#{SHA_REGEX}$/
+      commits_string = `git rev-parse #{commit_range}`
+    when /^#{SHA_REGEX}\.\.(#{SHA_REGEX})?$/, /^\.\.#{SHA_REGEX}$/
+      commits_string = `git log --format='%H' #{commit_range}`
+    else
+      Trollop::die "#{commit_range} is an invalid commit range specification"
+    end
+    exit(1) unless $?.to_i.zero?
+    commits = commits_string.split("\n").map(&:strip)
+
+    if commits.empty?
+      puts "No commits in range."
+      exit 0
+    end
+
+    unapproved_commits = {}
+    commits.each do |sha|
+      uri = URI.parse(File.join(configuration["barkeep_server"], "/api/commits/#{repo}/#{sha}"))
+      result = Net::HTTP.get_response uri
+      if result.code.to_i != 200
+        error = JSON.parse(result.body)["message"] rescue nil
+        puts error ? "Error: #{error}" : "Unspecified server error."
+        exit 1
+      end
+      info = JSON.parse(result.body)
+      next if info["approved"]
+      author_name = `git log --format='%an' #{sha} -n 1`
+      if options[:stop_on_unapproved]
+        puts "Found unapproved commit #{sha} by #{author_name}"
+        exit 1
+      end
+      unapproved_commits[sha] = author_name
+    end
+
+    if unapproved_commits.empty?
+      puts "#{commits.size} approved commit(s) and no unapproved commits in the given range."
+    else
+      puts "#{commits.size - unapproved_commits.size} approved commit(s) and " <<
+           "#{unapproved_commits.size} unapproved commit(s) in the given range."
+      puts "Unapproved:"
+      unapproved_commits.each { |sha, author| puts "#{sha} #{author}" }
+      exit 1
+    end
+  end
+end

metadata

@@ -1,53 +1,109 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: barkeep-client
-version: !ruby/object:Gem::Version
-  version: 0.0.2
+version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 3
+  version: 0.0.3
 platform: ruby
-authors:
+authors: 
 - Caleb Spare
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000Z
-dependencies: []
-description: Who is the barkeep?
-email:
+
+date: 2011-12-08 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: trollop
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 83
+        segments: 
+        - 1
+        - 16
+        - 2
+        version: 1.16.2
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: dedent
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 0
+        - 2
+        version: 0.0.2
+  type: :runtime
+  version_requirements: *id002
+description: A command-line client for Barkeep's REST API.
+email: 
 - caleb@ooyala.com
-executables:
+executables: 
 - barkeep
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rbenv-version
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - barkeep_client.gemspec
 - bin/barkeep
-homepage: ''
+- lib/barkeep/commit.rb
+- lib/barkeep/constants.rb
+- lib/barkeep/unapproved.rb
+has_rdoc: true
+homepage: https://github.com/ooyala/barkeep
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: barkeep-client
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Who is the barkeep?
+summary: Barkeep command-line client
 test_files: []
+