barkeep-client 0.1.2 → 0.1.4

data/bin/barkeep

@@ -4,16 +4,17 @@ require "rubygems"
 require "dedent"
 require "yaml"
 
-require "barkeep/commit"
 require "barkeep/configuration"
-require "barkeep/unapproved"
 require "barkeep/version"
 
 COMMANDS = {
   "commit" => "Get information about a particular commit.",
-  "unapproved" => "Find unapproved commits from a list or commit range."
+  "unapproved" => "Find unapproved commits from a list or commit range.",
+  "view" => "View a barkeep commit page in your browser."
 }
 
+COMMANDS.keys.each { |command| require "barkeep/#{command}" }
+
 def usage(exit_status)
   puts <<-EOS.dedent
     Usage:

data/lib/barkeep/commit.rb

@@ -9,7 +9,7 @@ require "barkeep/constants"
 module BarkeepClient
   module Commands
     def self.commit(configuration)
-      options = Trollop::options do
+      options = Trollop.options do
         banner <<-EOS.dedent
           Barkeep's 'commit' command shows information about a particular commit given its SHA.
 
@@ -20,21 +20,13 @@ module BarkeepClient
           to specify a particular repository, and [options] can include:
         EOS
       end
-      Trollop::die "must provide a commit sha" unless ARGV.size == 1
+      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
+      begin
+        repo, sha = Commands.parse_commit(ARGV[0])
+      rescue RuntimeError => e
+        Trollop.die e.message
+      end
 
       begin
         result = BarkeepClient.commits(configuration, repo, [sha])[sha]
@@ -45,6 +37,21 @@ module BarkeepClient
 
       result.each { |key, value| puts "  #{key.rjust(result.keys.map(&:size).max)}: #{value}" }
     end
+
+    def self.parse_commit(commit_specification)
+      case commit_specification
+      when %r{^[^/]+/#{SHA_REGEX}$} # foo/abc123
+        commit_specification.split "/"
+      when /^#{SHA_REGEX}$/ # abc123
+        repo = File.basename(`git rev-parse --show-toplevel`).strip
+        if repo.empty?
+          raise "need to be in a git repo or specify a repository (e.g. myrepo/abc123)"
+        end
+        [repo, commit_specification]
+      else
+        raise "#{commit_specification} is an invalid commit specification"
+      end
+    end
   end
 
   # Core method for calling Barkeep's commit API call.
@@ -53,7 +60,11 @@ module BarkeepClient
     result = {}
     shas.each do |sha|
       uri = URI.parse(File.join(configuration["barkeep_server"], "/api/commits/#{repo}/#{sha}"))
-      response = Net::HTTP.get_response uri
+      begin
+        response = Net::HTTP.get_response uri
+      rescue SocketError
+        raise "Cannot connect to the Barkeep server."
+      end
       if response.code.to_i != 200
         error = JSON.parse(response.body)["message"] rescue nil
         raise error ? "Error: #{error}" : "Unspecified server error."

data/lib/barkeep/unapproved.rb

@@ -9,7 +9,7 @@ require "barkeep/constants"
 module BarkeepClient
   module Commands
     def self.unapproved(configuration)
-      options = Trollop::options do
+      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.
@@ -26,11 +26,11 @@ module BarkeepClient
           [options] can include:
         EOS
       end
-      Trollop::die "must provide a commit range" if ARGV.empty?
+      Trollop.die "must provide a commit range" if ARGV.empty?
 
       repo = File.basename(`git rev-parse --show-toplevel`).strip
       if repo.empty?
-        Trollop::die "need to be in a git repo"
+        Trollop.die "need to be in a git repo"
       end
 
       commit_range = ARGV.map { |arg| "'#{arg}'" }.join(" ")

data/lib/barkeep/version.rb

@@ -1,3 +1,3 @@
 module BarkeepClient
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/lib/barkeep/view.rb

@@ -0,0 +1,45 @@
+require "trollop"
+require "dedent"
+
+require "barkeep/commit"
+
+module BarkeepClient
+  module Commands
+    def self.view(configuration)
+      options = Trollop.options do
+        banner <<-EOS.dedent
+          Barkeep's 'view' command opens the Barkeep commit page for a commit.
+
+          Usage:
+              $ barkeep view [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
+
+      begin
+        repo, sha = Commands.parse_commit(ARGV[0])
+      rescue RuntimeError => e
+        Trollop.die e.message
+      end
+
+      begin
+        result = BarkeepClient.commits(configuration, repo, [sha])[sha]
+      rescue RuntimeError => e
+        puts e.message
+        exit 1
+      end
+
+      # Try xdg-open (linux) open (mac os). Otherwise throw an error.
+      open_command = ["xdg-open", "open"].reject { |c| `which #{c}`.empty? }.first
+      unless open_command
+        puts "No application available to open a url (tried 'xdg-open' and 'open')."
+        exit 1
+      end
+
+      puts `#{open_command} #{result["link"]}`
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barkeep-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-19 00:00:00.000000000Z
+date: 2011-12-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70356271100060 !ruby/object:Gem::Requirement
+  requirement: &70185491808140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *70356271100060
+  version_requirements: *70185491808140
 - !ruby/object:Gem::Dependency
   name: dedent
-  requirement: &70356271098120 !ruby/object:Gem::Requirement
+  requirement: &70185491806960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70356271098120
+  version_requirements: *70185491806960
 description: A command-line client for Barkeep's REST API.
 email:
 - caleb@ooyala.com
@@ -55,6 +55,7 @@ files:
 - lib/barkeep/constants.rb
 - lib/barkeep/unapproved.rb
 - lib/barkeep/version.rb
+- lib/barkeep/view.rb
 homepage: https://github.com/ooyala/barkeep
 licenses: []
 post_install_message: