phabricator 0.0.4 → 0.0.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phabricator (0.0.1)
+    phabricator (0.0.5)
       rest-client
 
 GEM
@@ -23,7 +23,6 @@ GEM
     powerbar (1.0.11)
       ansi (~> 1.4.0)
       hashie (>= 1.1.0)
-    rake (10.2.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
 
@@ -36,4 +35,3 @@ DEPENDENCIES
   minitest-reporters
   mocha
   phabricator!
-  rake

data/README.md

@@ -16,4 +16,38 @@ Or install it yourself as:
 
 ## Usage
 
-TODO (:
+### Configuration
+
+You can configure Phabricator to use a specific host, user, and cert. Otherwise,
+it will fall back to whatever is in your `~/.arcrc` file.
+
+```ruby
+Phabricator.configure do |c|
+  c.host = 'secure.phabricator.com'
+  c.user = 'amber'
+  c.cert = '<CERT>'
+end
+```
+
+### Projects
+
+```ruby
+# Find the project given a project name.
+Phabricator::Project.find_by_name('Project')
+```
+
+### Tasks
+
+```ruby
+# Create a Maniphest task.
+Phabricator::Maniphest::Task.create('title')
+
+# Create a Maniphest task with more detail.
+Phabricator::Maniphest::Task.create('title', 'description', ['Project'], 'normal')
+```
+
+### Contributing
+
+Patches welcome! (:
+
+For a list of Conduit methods available, see http://secure.phabricator.com/conduit.

data/lib/phabricator.rb

@@ -1,5 +1,9 @@
-module Phabricator; end
+require 'phabricator/config'
+require 'phabricator/version'
 
-require_relative 'phabricator/version'
-require_relative 'phabricator/conduit_client'
-require_relative 'phabricator/maniphest'
+module Phabricator
+  extend Phabricator::Config
+end
+
+require 'phabricator/conduit_client'
+require 'phabricator/maniphest'

data/lib/phabricator/conduit_client.rb

@@ -7,13 +7,16 @@ module Phabricator
     include Singleton
 
     def initialize
-      # Find the .arcrc file for Phabricator credentials.
-      filename = File.expand_path('~/.arcrc')
+      @host = Phabricator.host
+      @credentials = {
+        user: Phabricator.user,
+        cert: Phabricator.cert
+      }
 
-      if File.readable?(filename)
-        @settings = JSON.parse(File.read(filename))['hosts'].first
-      else
-        raise '~/.arcrc does not exist or is not readable.'
+      # The config is incomplete; try to get the credentials off the ~/.arcrc
+      # file instead.
+      if @host.nil? || @credentials.values.any? {|v| v.nil?}
+        get_credentials_from_file
       end
 
       connect
@@ -25,10 +28,10 @@ module Phabricator
       data = {
         client: 'phabricator-ruby',
         clientVersion: Phabricator::VERSION,
-        user: credentials['user'],
-        host: host,
+        user: @credentials[:user],
+        host: @host,
         authToken: token,
-        authSignature: Digest::SHA1.hexdigest("#{token}#{credentials['cert']}")
+        authSignature: Digest::SHA1.hexdigest("#{token}#{@credentials[:cert]}")
       }
 
       response = JSON.parse(post('conduit.connect', data, __conduit__: true))
@@ -48,19 +51,29 @@ module Phabricator
 
     private
 
+    def get_credentials_from_file
+      filename = File.expand_path('~/.arcrc')
+
+      if File.readable?(filename)
+        settings = JSON.parse(File.read(filename))
+        user_settings = settings['hosts'].first
+
+        @host = settings['config']['phabricator.uri']
+        @credentials = {
+          user: user_settings[1]['user'],
+          cert: user_settings[1]['cert']
+        }
+      else
+        raise 'No credentials passed in, and ~/.arcrc does not exist or is \
+          not readable.'
+      end
+    end
+
     def post(method, data, opts={})
-      RestClient.post("#{host}#{method}", {
+      RestClient.post("#{@host}/api/#{method}", {
         params: data.to_json,
         output: 'json'
       }.merge(opts))
     end
-
-    def host
-      @settings[0]
-    end
-
-    def credentials
-      @settings[1]
-    end
   end
 end

data/lib/phabricator/config.rb

@@ -0,0 +1,9 @@
+module Phabricator
+  module Config
+    attr_accessor :host, :user, :cert
+
+    def configure
+      yield self
+    end
+  end
+end

data/lib/phabricator/maniphest.rb

@@ -1,3 +1,3 @@
 module Phabricator::Maniphest; end;
 
-require_relative 'maniphest/task'
+require 'phabricator/maniphest/task'

data/lib/phabricator/maniphest/task.rb

@@ -1,5 +1,6 @@
-require_relative '../conduit_client'
-require_relative '../project'
+require 'phabricator/conduit_client'
+require 'phabricator/project'
+require 'phabricator/user'
 
 module Phabricator::Maniphest
   class Task
@@ -27,12 +28,14 @@ module Phabricator::Maniphest
     attr_reader :id
     attr_accessor :title, :description, :priority
 
-    def self.create(title, description=nil, projects=[], priority='normal', other={})
+    def self.create(title, description=nil, projects=[], priority='normal', owner=nil, ccs=[], other={})
       response = JSON.parse(client.request(:post, 'maniphest.createtask', {
         title: title,
         description: description,
         priority: Priority.send(priority),
-        projectPHIDs: projects.map {|p| Phabricator::Project.find_by_name(p).phid }
+        projectPHIDs: projects.map {|p| Phabricator::Project.find_by_name(p).phid },
+        ownerPHID: owner ? Phabricator::User.find_by_name(owner).phid : nil,
+        ccPHIDs: ccs.map {|c| Phabricator::User.find_by_name(c).phid }
       }.merge(other)))
 
       data = response['result']

data/lib/phabricator/project.rb

@@ -1,4 +1,4 @@
-require_relative './conduit_client'
+require 'phabricator/conduit_client'
 
 module Phabricator
   class Project
@@ -17,7 +17,9 @@ module Phabricator
     end
 
     def self.find_by_name(name)
-      populate_all if @@cached_projects.empty?
+      # Re-populate if we couldn't find it in the cache (this applies to
+      # if the cache is empty as well).
+      populate_all unless @@cached_projects[name]
 
       @@cached_projects[name]
     end

data/lib/phabricator/user.rb

@@ -0,0 +1,39 @@
+require 'phabricator/conduit_client'
+
+module Phabricator
+  class User
+    @@cached_users = {}
+
+    attr_reader :phid
+    attr_accessor :name
+
+    def self.populate_all
+      response = JSON.parse(client.request(:post, 'user.query'))
+
+      response['result'].each do |data|
+        user = User.new(data)
+        @@cached_users[user.name] = user
+      end
+
+    end
+
+    def self.find_by_name(name)
+      # Re-populate if we couldn't find it in the cache (this applies to
+      # if the cache is empty as well).
+      populate_all unless @@cached_users[name]
+
+      @@cached_users[name]
+    end
+
+    def initialize(attributes)
+      @phid = attributes['phid']
+      @name = attributes['userName']
+    end
+
+    private
+
+    def self.client
+      @client ||= Phabricator::ConduitClient.instance
+    end
+  end
+end

data/lib/phabricator/version.rb

@@ -1,3 +1,3 @@
 module Phabricator
-  VERSION = "0.0.4"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phabricator
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -104,9 +104,11 @@ files:
 - README.md
 - lib/phabricator.rb
 - lib/phabricator/conduit_client.rb
+- lib/phabricator/config.rb
 - lib/phabricator/maniphest.rb
 - lib/phabricator/maniphest/task.rb
 - lib/phabricator/project.rb
+- lib/phabricator/user.rb
 - lib/phabricator/version.rb
 - phabricator.gemspec
 - test/_lib.rb