taskmapper-github 0.11.2 → 0.11.3

data/Gemfile.lock

@@ -26,7 +26,7 @@ GEM
     builder (3.0.4)
     diff-lcs (1.1.3)
     fakeweb (1.3.0)
-    faraday (0.8.6)
+    faraday (0.8.7)
       multipart-post (~> 1.1)
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)

data/VERSION

@@ -1 +1 @@
-0.11.2
+0.11.3

data/lib/provider/github.rb

@@ -11,25 +11,27 @@ module TaskMapper::Provider
     def self.new(auth = {})
       TaskMapper.new(:github, auth)
     end
+
+    def provider
+      TaskMapper::Provider::Github
+    end
+
+    def new_github_client(auth)
+      Octokit::Client.new auth
+    end
     
     # declare needed overloaded methods here
     def authorize(auth = {})
       @authentication ||= TaskMapper::Authenticator.new(auth)
-      login = @authentication.login || @authentication.username
-      if login.blank?
-        raise TaskMapper::Exception.new('Please provide at least a username')
-      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.api = Octokit::Client.new(:login => login)
-      end
-      TaskMapper::Provider::Github.login = login
+      auth[:login] = auth[:login] || auth[:username]
+      raise TaskMapper::Exception.new('Please provide at least a username') if auth[:login].blank?
+      provider.login = auth[:login]
+      provider.user_token = auth[:password] || auth[:token]
+      provider.api = new_github_client auth
     end
 
     def valid?
-      TaskMapper::Provider::Github.api.authenticated? || TaskMapper::Provider::Github.api.oauthed?
+      provider.api.authenticated? || provider.api.oauthed?
     end
 
   end

data/lib/provider/octokit_wrapper.rb

@@ -0,0 +1,13 @@
+module TaskMapper::Provider::Github
+  class OctokitWrapper
+
+    def initialize(username, password)
+      @username = username
+      @password = password
+      @octokit = Octokit::Client.new(:login => @username, :password => @password)
+    end
+
+    def valid?
+    end
+  end
+end

data/lib/provider/project.rb

@@ -12,11 +12,11 @@ module TaskMapper::Provider
           @system_data = {:client => object} 
           unless object.is_a? Hash
             hash = {:description => object.description,
-                    :created_at => object.created_at,
-                    :updated_at => object.created_at,
-                    :name => object.name,
-                    :id => object.name,
-                    :owner => object.owner}
+              :created_at => object.created_at,
+              :updated_at => object.created_at,
+              :name => object.name,
+              :id => object.name,
+              :owner => object.owner}
           else 
             hash = object
           end 
@@ -61,8 +61,8 @@ module TaskMapper::Provider
         end
 
         def find_by_id(id)
-          id = "#{TaskMapper::Provider::Github.login}/#{id}" unless id.include?("/")
-          self.new TaskMapper::Provider::Github.api.repository(id) 
+          project_id = "#{TaskMapper::Provider::Github.login}/#{id}" unless id.include?("/")
+          self.new TaskMapper::Provider::Github.api.repository(project_id)
         end
 
         def find_all

data/lib/provider/ticket.rb

@@ -61,13 +61,9 @@ module TaskMapper::Provider
         search_by_attribute(issues, attributes)
       end
 
-      def self.last_modified
-        TaskMapper::Provider::Github.api.last_modified || Time.now.httpdate
-      end
-
       def self.find_all(project_id)
         issues = []
-        issues = Array(TaskMapper::Provider::Github.api.issues(project_id, :since => last_modified))
+        issues = Array(TaskMapper::Provider::Github.api.issues(project_id)) 
         issues += TaskMapper::Provider::Github.api.issues(project_id, {:state => "closed"}) unless issues.empty?
         issues.collect do |issue| 
           issue.merge!(:project_id => project_id)

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?since', 'org_repos.json')
+      stub_get('https://taskmapper-user:Tm123456@api.github.com/orgs/2hf/repos', '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.11.2"
+  s.version = "0.11.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["HybridGroup"]
-  s.date = "2013-03-14"
+  s.date = "2013-04-01"
   s.description = "This provides an interface with github through the taskmapper gem."
   s.email = "hong.quach@abigfisch.com"
   s.extra_rdoc_files = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/provider/comment.rb",
     "lib/provider/github.rb",
+    "lib/provider/octokit_wrapper.rb",
     "lib/provider/project.rb",
     "lib/provider/ticket.rb",
     "lib/taskmapper-github.rb",
@@ -52,11 +53,12 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/taskmapper-github_spec.rb",
     "spec/ticket_spec.rb",
+    "taskmapper-github-0.11.2.gem",
     "taskmapper-github.gemspec"
   ]
   s.homepage = "http://github.com/kiafaldorius/taskmapper-github"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "The github provider for taskmapper"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taskmapper-github
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taskmapper
@@ -145,6 +145,7 @@ files:
 - VERSION
 - lib/provider/comment.rb
 - lib/provider/github.rb
+- lib/provider/octokit_wrapper.rb
 - lib/provider/project.rb
 - lib/provider/ticket.rb
 - lib/taskmapper-github.rb
@@ -166,6 +167,7 @@ files:
 - spec/spec_helper.rb
 - spec/taskmapper-github_spec.rb
 - spec/ticket_spec.rb
+- taskmapper-github-0.11.2.gem
 - taskmapper-github.gemspec
 homepage: http://github.com/kiafaldorius/taskmapper-github
 licenses: []
@@ -181,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2844606696510024364
+      hash: -4503675965697247980
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -190,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: The github provider for taskmapper