octopi 0.4.0 → 0.4.1

data/README.markdown

@@ -6,6 +6,10 @@ To install it as a Gem, just run:
 
     $ sudo gem install octopi
 
+To include it in your modules or in irb use:
+
+    include Octopi
+
 Get notifications via Twitter, following @octopi_gem:
 http://twitter.com/octopi_gem
   

data/Rakefile

@@ -15,6 +15,8 @@ begin
     gem.add_dependency('httparty', '>= 0.4.5')
     gem.add_dependency('mechanize', '>= 0.9.3')
     gem.add_dependency('api_cache', '>= 0')
+    gem.add_development_dependency 'shoulda'
+    gem.add_development_dependency 'fakeweb' 
     gem.files.exclude 'test/**/*'
     gem.files.exclude 'test*'
     gem.files.exclude 'doc/**/*'

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 0
-:build: 
 :major: 0
 :minor: 4
+:patch: 1
+:build: 

data/lib/octopi/api.rb

@@ -103,7 +103,6 @@ module Octopi
     
     
     def find_all(path, result_key, query, klass=nil, cache=true)
-      { :query => query, :id => query, :cache => cache }
       result = get(path, { :query => query, :id => query, :cache => cache }, klass)
       result[result_key]
     end
@@ -190,7 +189,7 @@ module Octopi
       # puts resp.code.inspect
       raise NotFound, klass || self.class if resp.code.to_i == 404
       raise APIError, 
-        "GitHub returned status #{resp.code}" unless resp.code.to_i == 200
+        "GitHub returned status #{resp.code}" unless resp.code.to_i == 200 || resp.code.to_i == 201
       # FIXME: This fails for showing raw Git data because that call returns
       # text/html as the content type. This issue has been reported.
       

data/lib/octopi/issue.rb

@@ -33,12 +33,14 @@ module Octopi
     def self.find_all(options={})
       ensure_hash(options)
       user, repo = gather_details(options)
-      state = (options[:state] || "open").downcase
-      validate_args(user => :user, repo.name => :repo, state => :state)
-
-      issues = super user, repo.name, state
-      issues.each { |i| i.repository = repo }
-      issues
+      states = [options[:state]] if options[:state]
+      states ||= ["open", "closed"]
+      issues = []
+      states.each do |state|
+        validate_args(user => :user, repo.name => :repo, state => :state)
+        issues << super(user, repo.name, state)
+      end
+      issues.flatten.each { |i| i.repository = repo }
     end
   
     # TODO: Make find use hashes like find_all
@@ -99,6 +101,11 @@ module Octopi
       IssueComment.new(data['comment'])
     end
     
+    def comments
+      data = Api.api.get(command_path("comments"))
+      data["comments"].map { |c| IssueComment.new(c) }
+    end
+    
     private
     def prefix(command)
       "/issues/#{command}/#{repository.owner}/#{repository.name}"

data/lib/octopi/issue_comment.rb

@@ -1,7 +1,6 @@
 module Octopi
   class IssueComment < Base
     include Resource
-    attr_accessor :comment, :status
-    
+    attr_accessor :body, :user
   end
 end

data/lib/octopi/repository.rb

@@ -97,7 +97,7 @@ module Octopi
     end
     
     def issues(state = "open")
-      IssueSet.new(Octopi::Issue.find_all(:user => owner, :repository => self))
+      IssueSet.new(Octopi::Issue.find_all(:user => owner, :repository => self, :state => state))
     end
    
     def all_issues
@@ -109,7 +109,7 @@ module Octopi
     end
 
     def collaborators
-      property('collaborators', [self.owner, self.name].join('/')).values.map { |v| User.find(v.join) }
+      property('collaborators', [self.owner, self.name].join('/')).values.flatten.map { |v| User.find(v) }
     end  
 
     def languages
@@ -119,6 +119,10 @@ module Octopi
     def self.create(options={})
       raise AuthenticationRequired, "To create a repository you must be authenticated." if Api.api.read_only?
       self.validate_args(options[:name] => :repo)
+      if options[:user]
+        self.validate_args(options[:user] => :user)
+        options[:name] = "#{options[:user]}/#{options[:name]}"
+      end
       new(Api.api.post(path_for(:create), options.merge( :cache => false ))["repository"])
     end
     

data/octopi.gemspec

@@ -1,88 +1,85 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{octopi}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Felipe Coury"]
-  s.date = %q{2010-12-05}
+  s.date = %q{2011-04-28}
   s.email = %q{felipe.coury@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.markdown"
+    "README.markdown"
   ]
   s.files = [
-    ".gitignore",
-     ".yardoc",
-     "CHANGELOG.md",
-     "LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION.yml",
-     "contrib/backup.rb",
-     "lib/ext/string_ext.rb",
-     "lib/octopi.rb",
-     "lib/octopi/api.rb",
-     "lib/octopi/base.rb",
-     "lib/octopi/blob.rb",
-     "lib/octopi/branch.rb",
-     "lib/octopi/branch_set.rb",
-     "lib/octopi/comment.rb",
-     "lib/octopi/commit.rb",
-     "lib/octopi/error.rb",
-     "lib/octopi/file_object.rb",
-     "lib/octopi/gist.rb",
-     "lib/octopi/issue.rb",
-     "lib/octopi/issue_comment.rb",
-     "lib/octopi/issue_set.rb",
-     "lib/octopi/key.rb",
-     "lib/octopi/key_set.rb",
-     "lib/octopi/plan.rb",
-     "lib/octopi/repository.rb",
-     "lib/octopi/repository_set.rb",
-     "lib/octopi/resource.rb",
-     "lib/octopi/self.rb",
-     "lib/octopi/tag.rb",
-     "lib/octopi/user.rb",
-     "octopi.gemspec"
+    ".yardoc",
+    "CHANGELOG.md",
+    "LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "VERSION.yml",
+    "contrib/backup.rb",
+    "lib/ext/string_ext.rb",
+    "lib/octopi.rb",
+    "lib/octopi/api.rb",
+    "lib/octopi/base.rb",
+    "lib/octopi/blob.rb",
+    "lib/octopi/branch.rb",
+    "lib/octopi/branch_set.rb",
+    "lib/octopi/comment.rb",
+    "lib/octopi/commit.rb",
+    "lib/octopi/error.rb",
+    "lib/octopi/file_object.rb",
+    "lib/octopi/gist.rb",
+    "lib/octopi/issue.rb",
+    "lib/octopi/issue_comment.rb",
+    "lib/octopi/issue_set.rb",
+    "lib/octopi/key.rb",
+    "lib/octopi/key_set.rb",
+    "lib/octopi/plan.rb",
+    "lib/octopi/repository.rb",
+    "lib/octopi/repository_set.rb",
+    "lib/octopi/resource.rb",
+    "lib/octopi/self.rb",
+    "lib/octopi/tag.rb",
+    "lib/octopi/user.rb",
+    "octopi.gemspec"
   ]
   s.homepage = %q{http://github.com/fcoury/octopi}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{octopi}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{A Ruby interface to GitHub API v2}
   s.test_files = [
+    "examples/authenticated.rb",
+    "examples/issues.rb",
+    "examples/overall.rb",
     "test/api_test.rb",
-     "test/authenticated_test.rb",
-     "test/base_test.rb",
-     "test/blob_test.rb",
-     "test/branch_test.rb",
-     "test/commit_test.rb",
-     "test/file_object_test.rb",
-     "test/gist_test.rb",
-     "test/issue_comment.rb",
-     "test/issue_set_test.rb",
-     "test/issue_test.rb",
-     "test/key_set_test.rb",
-     "test/key_test.rb",
-     "test/repository_set_test.rb",
-     "test/repository_test.rb",
-     "test/stubs/commits/fcoury/octopi/octopi.rb",
-     "test/tag_test.rb",
-     "test/test_helper.rb",
-     "test/user_test.rb",
-     "examples/authenticated.rb",
-     "examples/issues.rb",
-     "examples/overall.rb"
+    "test/authenticated_test.rb",
+    "test/base_test.rb",
+    "test/blob_test.rb",
+    "test/branch_test.rb",
+    "test/commit_test.rb",
+    "test/file_object_test.rb",
+    "test/gist_test.rb",
+    "test/issue_comment.rb",
+    "test/issue_set_test.rb",
+    "test/issue_test.rb",
+    "test/key_set_test.rb",
+    "test/key_test.rb",
+    "test/repository_set_test.rb",
+    "test/repository_test.rb",
+    "test/stubs/commits/fcoury/octopi/octopi.rb",
+    "test/tag_test.rb",
+    "test/test_helper.rb",
+    "test/user_test.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
@@ -90,17 +87,23 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<httparty>, [">= 0.4.5"])
       s.add_runtime_dependency(%q<mechanize>, [">= 0.9.3"])
       s.add_runtime_dependency(%q<api_cache>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<fakeweb>, [">= 0"])
     else
       s.add_dependency(%q<nokogiri>, [">= 1.3.1"])
       s.add_dependency(%q<httparty>, [">= 0.4.5"])
       s.add_dependency(%q<mechanize>, [">= 0.9.3"])
       s.add_dependency(%q<api_cache>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<fakeweb>, [">= 0"])
     end
   else
     s.add_dependency(%q<nokogiri>, [">= 1.3.1"])
     s.add_dependency(%q<httparty>, [">= 0.4.5"])
     s.add_dependency(%q<mechanize>, [">= 0.9.3"])
     s.add_dependency(%q<api_cache>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<fakeweb>, [">= 0"])
   end
 end
 

data/test/commit_test.rb

@@ -24,6 +24,13 @@ class CommitTest < Test::Unit::TestCase
         assert_equal 30, commits.size
       end
       
+      should "second page of commits" do
+        commits = Commit.find_all(:user => "fcoury", :repository => "octopi", :page => 2)
+        assert_not_nil commits
+        assert_equal 30, commits.size
+        assert_not_nil commits.first.repository
+      end
+      
       should "be able to specify a branch" do
         commits = Commit.find_all(:user => "fcoury", :repository => "octopi", :branch => "lazy")
         assert_not_nil commits

data/test/issue_test.rb

@@ -17,20 +17,26 @@ class IssueTest < Test::Unit::TestCase
       should "using objects" do
         issues = Issue.find_all(:user => @user, :repo => @repo)
         assert_not_nil issues
-        assert_equal 21, issues.size
+        assert_equal 30, issues.size
       end
-      
+
       should "using strings" do
         issues = Issue.find_all(:user => "fcoury", :repo => "octopi")
         assert_not_nil issues
-        assert_equal 21, issues.size
+        assert_equal 30, issues.size
       end
-      
-      should "specifying a state" do
+
+      should "all closed issues" do
         issues = Issue.find_all(:user => @user, :repo => @repo, :state => "closed")
         assert_not_nil issues
         assert_equal 9, issues.size
       end
+
+      should "all open issues" do
+        issues = Issue.find_all(:user => @user, :repo => @repo, :state => "open")
+        assert_not_nil issues
+        assert_equal 21, issues.size
+      end
     end
     
     context "finding a single issue" do
@@ -115,6 +121,13 @@ class IssueTest < Test::Unit::TestCase
         comment = @issue.comment("Yes, it is broken.")
         assert comment.is_a?(IssueComment)
       end
+      
+      should "be able to get all comments" do
+        first_comment = @issue.comments.first
+        assert first_comment.is_a?(IssueComment)
+        assert_equal "This is fixed in recent release.", first_comment.body
+        assert_equal "radar", first_comment.user
+      end
     end
   end
 end

data/test/repository_test.rb

@@ -84,10 +84,10 @@ class RepositoryTest < Test::Unit::TestCase
       assert_equal 21, issues.size
     end
     
-    should "be able to find all issues" do
+    should "be able to find all issues, regardless of state" do
       issues = @repository.all_issues
       assert_not_nil issues
-      assert_equal 42, issues.size
+      assert_equal 30, issues.size
     end
     
     should "be able to find an issue" do
@@ -97,8 +97,9 @@ class RepositoryTest < Test::Unit::TestCase
     should "be able to find all collaborators" do
       @collaborators = @repository.collaborators
       assert_not_nil @collaborators
-      assert_equal 1, @collaborators.size
+      assert_equal 2, @collaborators.size
       assert @collaborators.first.is_a?(User)
+      assert @collaborators.last.is_a?(User)
     end
 
     should "be able to find all languages" do
@@ -113,6 +114,12 @@ class RepositoryTest < Test::Unit::TestCase
       end
     end
     
+    should "be able to create a repository under another user (or organization)" do
+      auth do
+        Repository.create(:name => "octopus", :user => "other-user")
+      end
+    end
+
     should "be able to delete a repository" do
       auth do
         @repository.delete!

data/test/test_helper.rb

@@ -63,7 +63,10 @@ def fake_everything
         "issues/list/fcoury/octopi/open" => issues("open"),
         "issues/list/fcoury/octopi/closed" => issues("closed"),
         
-        "issues/search/fcoury/octopi/open/test" => issues("search"),        
+        "issues/search/fcoury/octopi/open/test" => issues("search"),      
+        
+        #comments for an issue
+        "issues/comments/fcoury/octopi/28" => File.join("comments", "fcoury", "octopi", "comments"),
         
         # Closed issue
         "issues/show/fcoury/octopi/27" => issues("27"),

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: octopi
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
+  prerelease: 
+  version: 0.4.1
 platform: ruby
 authors: 
 - Felipe Coury
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-05 00:00:00 +11:00
+date: 2011-04-28 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
         version: 1.3.1
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 4
-        - 5
         version: 0.4.5
   type: :runtime
   version_requirements: *id002
@@ -58,11 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 9
-        - 3
         version: 0.9.3
   type: :runtime
   version_requirements: *id003
@@ -74,12 +54,31 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: 
 email: felipe.coury@gmail.com
 executables: []
@@ -90,7 +89,6 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files: 
-- .gitignore
 - .yardoc
 - CHANGELOG.md
 - LICENSE
@@ -123,6 +121,9 @@ files:
 - lib/octopi/tag.rb
 - lib/octopi/user.rb
 - octopi.gemspec
+- examples/authenticated.rb
+- examples/issues.rb
+- examples/overall.rb
 - test/api_test.rb
 - test/authenticated_test.rb
 - test/base_test.rb
@@ -142,16 +143,13 @@ files:
 - test/tag_test.rb
 - test/test_helper.rb
 - test/user_test.rb
-- examples/authenticated.rb
-- examples/issues.rb
-- examples/overall.rb
 has_rdoc: true
 homepage: http://github.com/fcoury/octopi
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -159,27 +157,24 @@ required_ruby_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 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: octopi
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A Ruby interface to GitHub API v2
 test_files: 
+- examples/authenticated.rb
+- examples/issues.rb
+- examples/overall.rb
 - test/api_test.rb
 - test/authenticated_test.rb
 - test/base_test.rb
@@ -199,6 +194,3 @@ test_files:
 - test/tag_test.rb
 - test/test_helper.rb
 - test/user_test.rb
-- examples/authenticated.rb
-- examples/issues.rb
-- examples/overall.rb

data/.gitignore

@@ -1,4 +0,0 @@
-examples/github.yml
-doc/
-pkg/
-contrib/nothingspecial.rb