taskmapper-github 0.10.4 → 0.11.0

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 gem "taskmapper", "~> 0.8" 
-gem "octokit", "~> 1.9"
+gem "octokit", :git => "git://github.com/ajonas04/octokit.git"
 group :development do 
   gem "jeweler", "~> 1.6"
   gem "rspec", "~> 2.3"

data/Gemfile.lock

@@ -1,56 +1,61 @@
+GIT
+  remote: git://github.com/ajonas04/octokit.git
+  revision: 44633e89f77b0136cf496c6048bb751586f60b43
+  specs:
+    octokit (1.18.0)
+      addressable (~> 2.2)
+      faraday (~> 0.8)
+      faraday_middleware (~> 0.8)
+      hashie (~> 1.2)
+      multi_json (~> 1.3)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activeresource (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-    activesupport (3.2.6)
+    activeresource (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.8)
-    builder (3.0.0)
+    addressable (2.3.2)
+    builder (3.0.4)
     diff-lcs (1.1.3)
     fakeweb (1.3.0)
-    faraday (0.8.1)
+    faraday (0.8.4)
       multipart-post (~> 1.1)
-    faraday_middleware (0.8.8)
+    faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
     git (1.2.5)
     hashie (1.2.0)
-    i18n (0.6.0)
+    i18n (0.6.1)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.3)
-    multi_json (1.3.6)
+    json (1.7.6)
+    multi_json (1.5.0)
     multipart-post (1.1.5)
-    octokit (1.9.1)
-      addressable (~> 2.2)
-      faraday (~> 0.8)
-      faraday_middleware (~> 0.8)
-      hashie (~> 1.2)
-      multi_json (~> 1.3)
-    rake (0.9.2.2)
+    rake (10.0.3)
     rcov (1.0.0)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.0)
-    rspec-expectations (2.11.1)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
-    simplecov (0.6.4)
+    rspec-mocks (2.12.1)
+    simplecov (0.7.1)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     taskmapper (0.8.0)
       activeresource (~> 3.0)
       activesupport (~> 3.0)
@@ -62,7 +67,7 @@ PLATFORMS
 DEPENDENCIES
   fakeweb (~> 1.3)
   jeweler (~> 1.6)
-  octokit (~> 1.9)
+  octokit!
   rcov (~> 1.0)
   rspec (~> 2.3)
   simplecov (~> 0.5)

data/VERSION

@@ -1 +1 @@
-0.10.4
+0.11.0

data/lib/provider/comment.rb

@@ -6,16 +6,15 @@ module TaskMapper::Provider
     # versions of the ticket.
     #
     class Comment < TaskMapper::Provider::Base::Comment
-      attr_accessor :prefix_options
 
       def initialize(*object) 
         if object.first 
           object = object.first
           unless object.is_a? Hash
             hash = {:id => object.id,
-                    :body => object.body,
-                    :created_at => object.created_at,
-                    :author => object.user.login}
+              :body => object.body,
+              :created_at => object.created_at,
+              :author => object.user.login}
           else
             hash = object
           end
@@ -28,19 +27,15 @@ module TaskMapper::Provider
       end
 
       def created_at
-        @created_at ||= begin
-                          Time.parse(self[:created_at])
-                        rescue
-                          self[:created_at]
-                        end
+        Time.parse(self[:created_at])
+      rescue
+        self[:created_at]
       end
 
       def updated_at
-        @updated_at ||= begin
-                          Time.parse(self[:updated_at])
-                        rescue
-                          self[:updated_at]
-                        end
+        Time.parse(self[:updated_at])
+      rescue
+        self[:updated_at]
       end
 
       # declare needed overloaded methods here
@@ -50,7 +45,8 @@ module TaskMapper::Provider
       end
 
       def self.find_all(project_id, ticket_id)
-        TaskMapper::Provider::Github.api.issue_comments(project_id, ticket_id).collect do |comment|
+        current_time = Time.now.httpdate
+        Array(TaskMapper::Provider::Github.api.issue_comments(project_id, ticket_id, :since => current_time)).collect do |comment|
           comment.merge!(:project_id => project_id, :ticket_id => ticket_id)
           clean_body! comment
           self.new comment
@@ -58,10 +54,11 @@ module TaskMapper::Provider
       end
 
       def self.create(project_id, ticket_id, comment)
-        comment = comment[:body]
-        github_comment = TaskMapper::Provider::Github.api.add_comment(project_id, ticket_id, comment)
-        github_comment.merge!(:project_id => project_id, :ticket_id => ticket_id)
-        self.new github_comment
+        self.new github_comment(project_id, ticket_id, comment[:body]).merge!(:project_id => project_id, :ticket_id => ticket_id)
+      end
+
+      def self.github_comment(project_id, number, body)
+        TaskMapper::Provider::Github.api.add_comment(project_id, number, body)
       end
 
       # See https://www.kanbanpad.com/projects/31edb8d134e7967c1f0d#!xt-4f994f2101428900070759fd
@@ -74,8 +71,8 @@ module TaskMapper::Provider
       end
 
       private
-      def update_comment(repo, number, comment, options = {})
-        TaskMapper::Provider::Github.api.update_comment repo, number, comment, options
+      def update_comment(repo, number, comment)
+        TaskMapper::Provider::Github.api.update_comment repo, number, comment 
         true
       end
 

data/lib/provider/github.rb

@@ -6,7 +6,7 @@ module TaskMapper::Provider
     class << self
       attr_accessor :login, :api, :user_token 
     end
-    
+
     # This is for cases when you want to instantiate using TaskMapper::Provider::Github.new(auth)
     def self.new(auth = {})
       TaskMapper.new(:github, auth)
@@ -15,23 +15,17 @@ module TaskMapper::Provider
     # declare needed overloaded methods here
     def authorize(auth = {})
       @authentication ||= TaskMapper::Authenticator.new(auth)
-      auth = @authentication
-      login = auth.login || auth.username
-      if auth.login.blank? and auth.username.blank?
+      login = @authentication.login || @authentication.username
+      if login.blank?
         raise TaskMapper::Exception.new('Please provide at least a username')
-      elsif auth.token
-        TaskMapper::Provider::Github.login = login
-        TaskMapper::Provider::Github.user_token = auth.token
-        TaskMapper::Provider::Github.api = Octokit::Client.new(:login => login, :token => auth.token)
-      elsif auth.password
-        TaskMapper::Provider::Github.login = login
-        TaskMapper::Provider::Github.user_token = auth.token
-        TaskMapper::Provider::Github.api = Octokit::Client.new(:login => login, :password => auth.password)
+      elsif @authentication.token
+        TaskMapper::Provider::Github.api = Octokit::Client.new(:login => login, :token => @authentication.token)
+      elsif @authentication.password
+        TaskMapper::Provider::Github.api = Octokit::Client.new(:login => login, :password => @authentication.password)
       else 
-        TaskMapper::Provider::Github.login = login
-        TaskMapper::Provider::Github.user_token = nil
         TaskMapper::Provider::Github.api = Octokit::Client.new(:login => login)
       end
+      TaskMapper::Provider::Github.login = login
     end
 
     def valid?

data/lib/provider/ticket.rb

@@ -1,22 +1,20 @@
 module TaskMapper::Provider
   module Github
     # Ticket class for taskmapper-github
-    
+
     class Ticket < TaskMapper::Provider::Base::Ticket
-      
-      @@allowed_states = %w{open close}
-      attr_accessor :prefix_options
+
       # declare needed overloaded methods here
-      
+
       def initialize(*object) 
         if object.first
           object = object.first
           unless object.is_a? Hash
             hash = {:id => object.number,
-                    :status => object.state,
-                    :description => object.body,
-                    :user => object.user,
-                    :project_id => object.project_id}
+              :status => object.state,
+              :description => object.body,
+              :user => object.user,
+              :project_id => object.project_id}
           else 
             hash = object
           end
@@ -35,21 +33,21 @@ module TaskMapper::Provider
       def description
         self.body
       end
-      
+
       def description=(val)
         self.body = val
       end
-      
+
       def author
-        self.user.respond_to?('login') ? self.user.login : self.user
+        github_user
       end
 
       def requestor
-        self.user.respond_to?('login') ? self.user.login : self.user
+        github_user
       end
 
       def assignee
-        self.user.respond_to?('login') ? self.user.login : self.user
+        github_user
       end
 
       def self.find_by_id(project_id, number) 
@@ -64,9 +62,10 @@ module TaskMapper::Provider
       end
 
       def self.find_all(project_id)
+        current_time = Time.now.httpdate
         issues = []
-        issues += TaskMapper::Provider::Github.api.issues(project_id)
-        issues += TaskMapper::Provider::Github.api.issues(project_id, {:state => "closed"})
+        issues = Array(TaskMapper::Provider::Github.api.issues(project_id, :since => current_time))
+        issues += TaskMapper::Provider::Github.api.issues(project_id, {:state => "closed"}) unless issues.empty?
         issues.collect do |issue| 
           issue.merge!(:project_id => project_id)
           Ticket.new issue
@@ -114,6 +113,11 @@ module TaskMapper::Provider
       def comment!(attributes)
         Comment.create(project_id, number, attributes)
       end
+
+      private 
+      def github_user
+        self.user.login || self.user
+      end
     end
   end
 end

data/lib/taskmapper-github.rb

@@ -1,4 +1,4 @@
-#require YOUR_PROVIDER_API
+require 'bundler/setup'
 require 'octokit'
 require 'active_support/core_ext/string'
 require 'net/http'

data/spec/ticket_spec.rb

@@ -9,7 +9,7 @@ describe TaskMapper::Provider::Github::Ticket do
 
   describe "Retrieving tickets" do 
     before(:each) do 
-      stub_get('https://taskmapper-user:Tm123456@api.github.com/orgs/2hf/repos', 'org_repos.json')
+      stub_get('https://taskmapper-user:Tm123456@api.github.com/orgs/2hf/repos?since', 'org_repos.json')
       stub_get('https://taskmapper-user:Tm123456@api.github.com/repos/taskmapper-user/tmtest-repo/issues/1', 'issues/1.json')
       stub_get('https://taskmapper-user:Tm123456@api.github.com/repos/taskmapper-user/tmtest-repo/issues', 'issues.json')
       stub_get('https://taskmapper-user:Tm123456@api.github.com/repos/taskmapper-user/tmtest-repo/issues?state=closed', 'issues.json')

data/taskmapper-github.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "taskmapper-github"
-  s.version = "0.10.4"
+  s.version = "0.11.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["HybridGroup"]
-  s.date = "2012-12-01"
+  s.date = "2013-01-23"
   s.description = "This provides an interface with github through the taskmapper gem."
   s.email = "hong.quach@abigfisch.com"
   s.extra_rdoc_files = [
@@ -64,7 +64,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<taskmapper>, ["~> 0.8"])
-      s.add_runtime_dependency(%q<octokit>, ["~> 1.9"])
+      s.add_runtime_dependency(%q<octokit>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3"])
       s.add_development_dependency(%q<fakeweb>, ["~> 1.3"])
@@ -72,7 +72,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, ["~> 1.0"])
     else
       s.add_dependency(%q<taskmapper>, ["~> 0.8"])
-      s.add_dependency(%q<octokit>, ["~> 1.9"])
+      s.add_dependency(%q<octokit>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6"])
       s.add_dependency(%q<rspec>, ["~> 2.3"])
       s.add_dependency(%q<fakeweb>, ["~> 1.3"])
@@ -81,7 +81,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<taskmapper>, ["~> 0.8"])
-    s.add_dependency(%q<octokit>, ["~> 1.9"])
+    s.add_dependency(%q<octokit>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6"])
     s.add_dependency(%q<rspec>, ["~> 2.3"])
     s.add_dependency(%q<fakeweb>, ["~> 1.3"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taskmapper-github
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-01 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taskmapper
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -181,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -366567343
+      hash: 4124351922753570818
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: