barkeep-client 0.1.5 → 0.1.7

data/Gemfile.lock

@@ -1,14 +1,18 @@
 PATH
   remote: .
   specs:
-    barkeep-client (0.0.2)
+    barkeep-client (0.1.6)
       dedent (~> 0.0.2)
+      rest-client
       trollop (~> 1.16.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
     dedent (0.0.2)
+    mime-types (1.17.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     trollop (1.16.2)
 
 PLATFORMS

data/README.md

@@ -3,4 +3,4 @@ Barkeep Client
 
 This is a commandline tool to make use of the Barkeep REST API.
 
-See usage instructions in the Barkeep readme.
+See usage instructions in the Barkeep documentation.

data/barkeep_client.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency "trollop", "~> 1.16.2"
   s.add_dependency "dedent", "~> 0.0.2"
+  s.add_dependency "rest-client"
 end

data/lib/barkeep/commit.rb

@@ -1,7 +1,7 @@
 require "rubygems"
 require "trollop"
 require "dedent"
-require "net/http"
+require "rest_client"
 require "json"
 
 require "barkeep/constants"
@@ -29,7 +29,7 @@ module BarkeepClient
       end
 
       begin
-        result = BarkeepClient.commits(configuration, repo, [sha])[sha]
+        result = BarkeepClient.commits(configuration, repo, [sha]).values[0]
       rescue RuntimeError => e
         puts e.message
         exit 1
@@ -55,21 +55,21 @@ module BarkeepClient
   end
 
   # Core method for calling Barkeep's commit API call.
-  # TODO: Support querying lots of commits at once using the altered API call.
-  def self.commits(configuration, repo, shas)
+  def self.commits(configuration, repo, shas, fields = [])
     result = {}
-    shas.each do |sha|
-      uri = URI.parse(File.join(configuration["barkeep_server"], "/api/commits/#{repo}/#{sha}"))
-      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."
-      end
-      info = JSON.parse(response.body)
+    params = { :shas => shas.join(",") }
+    params[:fields] = fields.join(",") unless fields.empty?
+    begin
+      response = RestClient.post "http://#{configuration["barkeep_server"]}/api/commits/#{repo}", params
+    rescue SocketError
+      raise "Cannot connect to the Barkeep server at http:#{configuration["barkeep_server"]}."
+    end
+    if response.code != 200
+      error = JSON.parse(response.body)["message"] rescue nil
+      raise error ? "Error: #{error}" : "Unspecified server error."
+    end
+    commits = JSON.parse(response.body)
+    commits.each do |sha, info|
       commit_data = {}
       info.each do |key, value|
         next if value.nil?

data/lib/barkeep/configuration.rb

@@ -23,6 +23,10 @@ module BarkeepClient
               REQUIRED_CONFIG_KEYS.join(', ')
       raise error
     end
+
+    # Tweak parameters for backwards compatibility:
+    configuration["barkeep_server"].sub! %r{^http://}, ""
+
     configuration
   end
 end

data/lib/barkeep/unapproved.rb

@@ -1,7 +1,6 @@
 require "rubygems"
 require "trollop"
 require "dedent"
-require "net/http"
 require "json"
 
 require "barkeep/constants"
@@ -41,7 +40,7 @@ module BarkeepClient
       if commits.empty?
         puts "No commits in range."
         exit 0
-      elsif commits.size > 100
+      elsif commits.size > 1000
         puts "Warning: #{commits.size} commits in range. Lookup could be very slow. Proceed? [yN]"
         unless STDIN.gets.downcase.strip =~ /^y(es)?/
           puts "Aborting."
@@ -50,7 +49,7 @@ module BarkeepClient
       end
 
       begin
-        commit_data = BarkeepClient.commits(configuration, repo, commits)
+        commit_data = BarkeepClient.commits(configuration, repo, commits, ["approved"])
       rescue RuntimeError => e
         puts e.message
         exit 1

data/lib/barkeep/version.rb

@@ -1,3 +1,3 @@
 module BarkeepClient
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

data/lib/barkeep/view.rb

@@ -26,7 +26,7 @@ module BarkeepClient
       end
 
       begin
-        result = BarkeepClient.commits(configuration, repo, [sha])[sha]
+        result = BarkeepClient.commits(configuration, repo, [sha]).values[0]
       rescue RuntimeError => e
         puts e.message
         exit 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barkeep-client
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000Z
+date: 2012-05-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &11751060 !ruby/object:Gem::Requirement
+  requirement: &23208580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *11751060
+  version_requirements: *23208580
 - !ruby/object:Gem::Dependency
   name: dedent
-  requirement: &11741280 !ruby/object:Gem::Requirement
+  requirement: &23201960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,18 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *11741280
+  version_requirements: *23201960
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &23198240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *23198240
 description: A command-line client for Barkeep's REST API.
 email:
 - caleb@ooyala.com
@@ -43,7 +54,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rbenv-version
-- CHANGES.markdown
 - Gemfile
 - Gemfile.lock
 - README.md

data/CHANGES.markdown

@@ -1,15 +0,0 @@
-Barkeep Client Changes
-======================
-
-This file summarizes changes between barkeep-client gem versions.
-
-0.1.1
------
-
-* Make it easier to pass in arbitrary arguments to `git log` from the `unapproved` command using `--`.
-
-
-0.1.0
------
-
-Initial version, including `commit` and `unapproved` commands.