git-issue 0.7.3 → 0.7.4

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.7.4

data/git-issue.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-issue}
-  s.version = "0.7.3"
+  s.version = "0.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tomohito Ozaki"]
-  s.date = %q{2012-02-24}
+  s.date = %q{2012-02-28}
   s.default_executable = %q{git-issue}
   s.description = %q{git extention command for issue tracker system.}
   s.email = %q{ozaki@yuroyoro.com}

data/lib/git_issue.rb

@@ -64,19 +64,16 @@ module GitIssue
 
     begin
       its_type = Helper.configured_value('type')
-      apikey   = Helper.configured_value('apikey')
 
       # Use global config for hub
       if its_type.blank?
         github_user = Helper.global_configured_value('github.user')
         unless github_user.blank?
           its_type = 'github'
-          apikey   = Helper.global_configured_value('github.token')
         end
       end
 
       Helper.configure_error('type (redmine | github)', "git config issue.type redmine") if its_type.blank?
-      Helper.configure_error('apikey', "git config issue.apikey some_api_key")           if apikey.blank?
 
       its_klass = Helper.its_klass_of(its_type)
       status = its_klass.new(ARGV).execute || true

data/lib/git_issue/github.rb

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+require 'base64'
+require 'pit'
 
 module GitIssue
 class GitIssue::Github < GitIssue::Base
@@ -14,6 +16,10 @@ class GitIssue::Github < GitIssue::Base
 
     @user = options[:user] || configured_value('user')
     @user = global_configured_value('github.user') if @user.blank?
+    @user = Pit.get("github", :require => {
+        "user" => "Your user name in GitHub",
+    })["user"] if @user.blank?
+
     configure_error('user', "git config issue.user yuroyoro")  if @user.blank?
     @sslNoVerify = @options[:sslNoVerify] &&  RUBY_VERSION < '1.9.0'
   end
@@ -152,7 +158,9 @@ class GitIssue::Github < GitIssue::Base
 
     puts url if @debug
 
-    opt = {"Authorizaion" => "#{@user}/token:#{@apikey}"}
+    password = options[:password] || get_password(@user)
+    opt = {"Authorization" => "Basic " + Base64.encode64("#{@user}:#{password}")}
+
     opt[:ssl_verify_mode] = OpenSSL::SSL::VERIFY_NONE if @sslNoVerify
     json = open(url, opt) {|io|
       JSON.parse(io.read)
@@ -259,11 +267,9 @@ class GitIssue::Github < GitIssue::Base
   end
 
   def get_password(user)
-    print "password(#{user}): "
-    system "stty -echo"
-    password = $stdin.gets.chop
-    system "stty echo"
-    password
+    Pit.get("github", :require => {
+        "password" => "Your password in GitHub",
+    })["password"]
   end
 
   def oneline_issue(issue, options = {})

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-issue
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 7
-  - 3
-  version: 0.7.3
+  - 4
+  version: 0.7.4
 platform: ruby
 authors: 
 - Tomohito Ozaki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-24 00:00:00 +09:00
+date: 2012-02-28 00:00:00 +09:00
 default_executable: git-issue
 dependencies: 
 - !ruby/object:Gem::Dependency