octopi 0.4.4 → 0.4.5

data/.gitignore

@@ -3,3 +3,4 @@ doc/
 pkg/
 contrib/nothingspecial.rb
 **/*.swp
+*.rbc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    octopi (0.4.2)
+    octopi (0.4.4)
       api_cache
       httparty (>= 0.4.5)
       mechanize (>= 0.9.3)

data/README.markdown

@@ -54,8 +54,9 @@ Use the following format:
     #
 
     # GitHub user login and token
-    login: github-username
-    token: github-token
+    github:
+      user: github-username
+      token: github-token
 
     # Trace level
     # Possible values:
@@ -66,7 +67,7 @@ Use the following format:
   
   And change the way you connect to:
 
-    authenticated_with :config => "github.yml" do
+    authenticated :config => "github.yml") do
       (...)
     end
   
@@ -137,7 +138,7 @@ Single commit information:
 
 In alphabetical order:
 
-* Ryan Bigg - http://ryanbigg.net
+* Ryan Bigg - http://ryanbigg.com
 * Brandon Calloway - http://github.com/bcalloway
 * runpaint - http://github.com/runpaint
 

data/lib/octopi.rb

@@ -27,8 +27,12 @@ module Octopi
   
   def authenticated(options={}, &block)
     begin
-      config = config = File.open(options[:config]) { |yf| YAML::load(yf) } if options[:config]
-      config = read_gitconfig
+      if options[:config]
+        config = YAML.load_file(options[:config])
+      else
+        config = read_gitconfig
+      end
+
       options[:login] = config["github"]["user"]
       options[:token] = config["github"]["token"]
       
@@ -135,4 +139,4 @@ module Octopi
       puts text
     end
   end
-end
+end

data/lib/octopi/tree.rb

@@ -0,0 +1,15 @@
+module Octopi
+  class Tree < Base
+    attr_accessor :name, :size, :sha, :mode, :mime_type, :type, :user, :repository
+    
+    def self.find(options)
+      ensure_hash(options)
+      user, repo = gather_details(options)
+      route = "/tree/show/#{user}/#{repo}/#{options[:sha]}"
+      trees = Api.api.get(route)["tree"].map do |tree| 
+        Tree.new(tree.merge(:user => user, :repository => repo))
+      end
+      TreeSet.new(trees)
+    end
+  end
+end

data/lib/octopi/tree_set.rb

@@ -0,0 +1,11 @@
+require File.join(File.dirname(__FILE__), "tree")
+class Octopi::TreeSet < Array
+  include Octopi
+  attr_accessor :user, :repository
+  
+  def initialize(array)
+    self.user = array.first.user
+    self.repository = array.first.repository
+    super(array)
+  end
+end

data/lib/octopi/version.rb

@@ -1,3 +1,3 @@
 module Octopi
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/test/authenticated_test.rb

@@ -7,6 +7,13 @@ class AuthenticatedTest < Test::Unit::TestCase
   end
   
   context "Authenticating" do
+    should "be able to login with github.yml" do
+      authenticated :config => File.join(File.dirname(__FILE__), "github.yml") do
+        assert_equal "8f700e0d7747826f3e56ee13651414bd", Api.api.token
+        assert_not_nil User.find("fcoury")
+      end
+    end
+
     should "be possible with username and password" do
       authenticated_with(:login => "fcoury", :password => "yruocf") do
         assert_equal "8f700e0d7747826f3e56ee13651414bd", Api.api.token

data/test/github.yml

@@ -0,0 +1,3 @@
+github:
+  user: fcoury
+  token: 8f700e0d7747826f3e56ee13651414bd

data/test/tree_test.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
+
+class TreeTest < Test::Unit::TestCase
+  include Octopi
+
+  def setup
+    fake_everything
+  end
+  
+  should "be able to find a tree set" do
+    shared_options = { :user => "fcoury", :repo => "octopi"}
+    branch = Branch.all(shared_options).detect { |b| b.name == "master" }
+    assert Tree.find(shared_options.merge!(:sha => branch.sha)).is_a?(TreeSet)
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: octopi
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Felipe Coury
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 +10:00
+date: 2011-07-07 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -168,6 +168,8 @@ files:
 - lib/octopi/resource.rb
 - lib/octopi/self.rb
 - lib/octopi/tag.rb
+- lib/octopi/tree.rb
+- lib/octopi/tree_set.rb
 - lib/octopi/user.rb
 - lib/octopi/version.rb
 - octopi.gemspec
@@ -183,6 +185,7 @@ files:
 - test/commit_test.rb
 - test/file_object_test.rb
 - test/gist_test.rb
+- test/github.yml
 - test/issue_comment.rb
 - test/issue_set_test.rb
 - test/issue_test.rb
@@ -313,6 +316,7 @@ files:
 - test/stubs/users/wycats
 - test/tag_test.rb
 - test/test_helper.rb
+- test/tree_test.rb
 - test/user_test.rb
 - test_auth.rb
 has_rdoc: true
@@ -352,6 +356,7 @@ test_files:
 - test/commit_test.rb
 - test/file_object_test.rb
 - test/gist_test.rb
+- test/github.yml
 - test/issue_comment.rb
 - test/issue_set_test.rb
 - test/issue_test.rb
@@ -482,4 +487,5 @@ test_files:
 - test/stubs/users/wycats
 - test/tag_test.rb
 - test/test_helper.rb
+- test/tree_test.rb
 - test/user_test.rb