taskmapper-github 0.10.3 → 0.10.4

data/VERSION

@@ -1 +1 @@
-0.10.2
+0.10.4

data/lib/provider/github.rb

@@ -12,23 +12,27 @@ module TaskMapper::Provider
       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 = {})
-      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[:oauth_token]
-      provider.api = new_github_client auth
+      @authentication ||= TaskMapper::Authenticator.new(auth)
+      auth = @authentication
+      login = auth.login || auth.username
+      if auth.login.blank? and auth.username.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)
+      else 
+        TaskMapper::Provider::Github.login = login
+        TaskMapper::Provider::Github.user_token = nil
+        TaskMapper::Provider::Github.api = Octokit::Client.new(:login => login)
+      end
     end
-    
 
     def valid?
       TaskMapper::Provider::Github.api.authenticated? || TaskMapper::Provider::Github.api.oauthed?

data/taskmapper-github.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "taskmapper-github"
-  s.version = "0.10.3"
+  s.version = "0.10.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["HybridGroup"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taskmapper-github
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
   prerelease: 
 platform: ruby
 authors:
@@ -181,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 105230157
+      hash: -366567343
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: