ghi 0.9.3 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 542fd93fc503609bf5d4cc5a258356d35ee0313c
-  data.tar.gz: 03e5dc1531dd7a57fe02e36e265f54d94c799546
+  metadata.gz: 696fce57a7e89cb7685529b9e6bbabcefde0ee2d
+  data.tar.gz: 19a171ad807242aabe60dc72142a6fdf877f2685
 SHA512:
-  metadata.gz: f2984c9e741d600f119935ff9afb7b7a228839987d56caf40311aaaa43358ca000b5fdab2eba6cdea1f551ac0ce5b1d71e8c1cda7d2f43dea3e26b23b126cd30
-  data.tar.gz: 7e0e12147f1c5fc7f6a2cf6563076fa01e4e9648e0e0b9f0a0403627d95fcf405c399b3ce75400d14f489e747126617cf24ad820f56e31f373ae4348ab9999e7
+  metadata.gz: 8f9a475b4713a41828414f000d4e6da666dc75c0e43df5430041e776f73ff81d2b6f0383aeec8e38cabff04a03e0aeffe2bf2f4b11f58b1b4684af0e7854f828
+  data.tar.gz: dc0a1c4930f0a4445bcefac59501d58a2930462e06fe2c88b594699b85003d6e67545db7cc187c1c9477cf7bccdb7d32fa6820466eda3be96aec6917743d261e

data/lib/ghi/authorization.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'socket'
 
 module GHI
   module Authorization
@@ -39,7 +40,7 @@ module GHI
           system "git config#{' --global' unless local} github.user #{user}"
         end
 
-        store_token! username, token, local
+        store_token! user, token, local
       rescue Client::Error => e
         if e.response['X-GitHub-OTP'] =~ /required/
           puts "Bad code." if code
@@ -51,12 +52,13 @@ module GHI
         end
 
         if e.errors.any? { |err| err['code'] == 'already_exists' }
+          host = GHI.config('github.host') || 'github.com'
           message = <<EOF.chomp
 A ghi token already exists!
 
 Please revoke all previously-generated ghi personal access tokens here:
 
-  https://github.com/settings/applications
+  https://#{host}/settings/applications
 EOF
         else
           message = e.message

data/lib/ghi/client.rb

@@ -138,7 +138,9 @@ module GHI
         if password.nil?
           raise Authorization::Required, 'Authorization required'
         end
-      end
+			when Net::HTTPMovedPermanently
+				return Response.new(http.get(res['location']))
+			end
 
       raise Error, res
     end

data/lib/ghi/commands.rb

@@ -8,12 +8,15 @@ module GHI
     autoload :Close,     'ghi/commands/close'
     autoload :Comment,   'ghi/commands/comment'
     autoload :Config,    'ghi/commands/config'
+		autoload :Disable,   'ghi/commands/disable'
     autoload :Edit,      'ghi/commands/edit'
+		autoload :Enable,    'ghi/commands/enable'
     autoload :Help,      'ghi/commands/help'
     autoload :Label,     'ghi/commands/label'
     autoload :Milestone, 'ghi/commands/milestone'
     autoload :Reopen,    'ghi/commands/reopen'
     autoload :Show,      'ghi/commands/show'
+		autoload :Status,    'ghi/commands/status'
     autoload :Unassign,  'ghi/commands/unassign'
     autoload :Version,   'ghi/commands/version'
   end

data/lib/ghi/commands/command.rb

@@ -62,6 +62,17 @@ module GHI
         abort options.to_s
       end
 
+      def require_repo_name
+        require_repo
+        repo_array = repo.partition "/"
+        if repo_array.length >= 2
+          repo_name = repo_array[2]
+        else
+          repo_name = nil
+        end
+        return repo_name
+      end
+        
       def detect_repo
         remote   = remotes.find { |r| r[:remote] == 'upstream' }
         remote ||= remotes.find { |r| r[:remote] == 'origin' }

data/lib/ghi/commands/disable.rb

@@ -0,0 +1,35 @@
+module GHI
+  module Commands
+    class Disable < Command
+
+      def options
+        OptionParser.new do |opts|
+          opts.banner = 'usage: ghi disable'
+        end
+      end
+
+      def execute
+        begin
+          options.parse! args
+          @repo ||= ARGV[0] if ARGV.one?
+        rescue OptionParser::InvalidOption => e
+          fallback.parse! e.args
+          retry
+        end
+        repo_name = require_repo_name
+        unless repo_name.nil?
+          patch_data = {}
+          patch_data[:name] = repo_name
+          patch_data[:has_issues] = false
+          res = throb { api.patch "/repos/#{repo}", patch_data }.body
+          if !res['has_issues']
+            puts "Issues are now disabled for this repo"
+          else
+            puts "Something went wrong disabling issues for this repo"
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/ghi/commands/enable.rb

@@ -0,0 +1,36 @@
+module GHI
+  module Commands
+    class Enable < Command
+
+      def options
+        OptionParser.new do |opts|
+          opts.banner = 'usage: ghi enable'
+        end
+      end
+
+      def execute
+        begin
+          options.parse! args
+          @repo ||= ARGV[0] if ARGV.one?
+        rescue OptionParser::InvalidOption => e
+          fallback.parse! e.args
+          retry
+        end
+        repo_name = require_repo_name
+        unless repo_name.nil?
+          patch_data = {}
+          patch_data[:name] = repo_name
+          patch_data[:has_issues] = true
+          res = throb { api.patch "/repos/#{repo}", patch_data }.body
+          if res['has_issues']
+            puts "Issues are now enabled for this repo"
+          else
+            puts "Something went wrong enabling issues for this repo"
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/lib/ghi/commands/help.rb

@@ -35,6 +35,9 @@ The most commonly used ghi commands are:
    label       Create, list, modify, or delete labels
    assign      Assign an issue to yourself (or someone else)
    milestone   Manage project milestones
+   status      Determine whether or not issues are enabled for this repo
+   enable      Enable issues for the current repo
+   disable     Disable issues for the current repo
 
 See 'ghi help <command>' for more information on a specific command.
 EOF

data/lib/ghi/commands/list.rb

@@ -13,7 +13,7 @@ module GHI
         OptionParser.new do |opts|
           opts.banner = 'usage: ghi list [options]'
           opts.separator ''
-          opts.on '-a', '--global', '--all', 'all of your issues on GitHub' do
+          opts.on '-g', '--global', 'all of your issues on GitHub' do
             assigns[:filter] = 'all'
             @repo = nil
           end
@@ -100,6 +100,12 @@ module GHI
           ) do |mentioned|
             assigns[:mentioned] = mentioned || Authorization.username
           end
+          opts.on(
+            '-O', '--org <organization>', 'in repos within an organization you belong to'
+          ) do |org|
+	    assigns[:org] = org
+            @repo = nil
+          end
           opts.separator ''
         end
       end
@@ -172,7 +178,14 @@ module GHI
       private
 
       def uri
-        (repo ? "/repos/#{repo}" : '') << '/issues'
+        url = ''
+        if repo
+          url = "/repos/#{repo}"
+        end
+	if assigns[:org]
+          url = "/orgs/#{assigns[:org]}"
+        end
+        return url << '/issues'
       end
 
       def fallback

data/lib/ghi/commands/milestone.rb

@@ -103,7 +103,7 @@ EOF
         case action
         when 'index'
           if web
-            Web.new(repo).open 'issues/milestones', assigns
+            Web.new(repo).open 'milestones', assigns
           else
             assigns[:per_page] = 100
             state = assigns[:state] || 'open'

data/lib/ghi/commands/open.rb

@@ -52,7 +52,7 @@ EOF
 
         options.parse! args
 
-        if extract_issue
+        if GHI.config('ghi.infer-issue') != 'false' && extract_issue
           Edit.execute args.push('-so', issue, '--', repo)
           exit
         end

data/lib/ghi/commands/status.rb

@@ -0,0 +1,32 @@
+module GHI
+  module Commands
+    class Status < Command
+
+      def options
+        OptionParser.new do |opts|
+          opts.banner = 'usage: ghi status'
+        end
+      end
+
+      def execute
+        begin
+          options.parse! args
+          @repo ||= ARGV[0] if ARGV.one?
+        rescue OptionParser::InvalidOption => e
+          fallback.parse! e.args
+          retry
+        end
+        
+        require_repo
+        res = throb { api.get "/repos/#{repo}" }.body
+
+        if res['has_issues']
+          puts "Issues are enabled for this repo"
+        else
+          puts "Issues are not enabled for this repo"
+        end
+
+      end
+    end
+  end
+end

data/lib/ghi/commands/version.rb

@@ -1,9 +1,9 @@
 module GHI
   module Commands
     module Version
-      MAJOR   = 0
-      MINOR   = 9
-      PATCH   = 3
+      MAJOR   = 1
+      MINOR   = 0
+      PATCH   = 2
       PRE     = nil
 
       VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join '.'

data/lib/ghi/formatting.rb

@@ -84,7 +84,9 @@ module GHI
 
     def truncate string, reserved
       return string unless paginate?
-      result = string.scan(/.{0,#{columns - reserved}}(?:\s|\Z)/).first.strip
+      space=columns - reserved
+      space=5 if space < 5
+      result = string.scan(/.{0,#{space}}(?:\s|\Z)/).first.strip
       result << "..." if result != string
       result
     end
@@ -105,7 +107,7 @@ module GHI
     end
 
     def dimensions
-      `stty size`.chomp.split(' ').map { |n| n.to_i }
+      `stty size 2>/dev/null`.chomp.split(' ').map { |n| n.to_i }
     end
 
     #--
@@ -118,7 +120,8 @@ module GHI
 
     def format_issues_header
       state = assigns[:state] ||= 'open'
-      header = "# #{repo || 'Global,'} #{state} issues"
+      org = assigns[:org] ||= nil
+      header = "# #{repo || org || 'Global,'} #{state} issues"
       if repo
         if milestone = assigns[:milestone]
           case milestone
@@ -164,7 +167,6 @@ module GHI
       format_state assigns[:state], header
     end
 
-    # TODO: Show milestones.
     def format_issues issues, include_repo
       return 'None.' if issues.empty?
 
@@ -184,15 +186,18 @@ module GHI
         p = i['pull_request']['html_url'] and l += 2
         c = i['comments']
         l += c.to_s.length + 1 unless c == 0
+        m = i['milestone']
         [
           " ",
           (i['repo'].to_s.rjust(rmax) if i['repo']),
           format_number(n.to_s.rjust(nmax)),
           truncate(title, l),
           format_labels(labels),
+          (fg(:green) { m['title'] } if m),
           (fg('aaaaaa') { c } unless c == 0),
           (fg('aaaaaa') { '↑' } if p),
-          (fg(:yellow) { '@' } if a)
+          (fg(:yellow) { '@' } if a),
+          (fg('aaaaaa') { '‡' } if m)
         ].compact.join ' '
       }
     end
@@ -361,6 +366,7 @@ EOF
     def format_editor issue = nil
       message = ERB.new(<<EOF).result binding
 
+
 Please explain the issue. The first line will become the title. Trailing
 lines starting with '#' (like these) will be ignored, and empty messages will
 not be submitted. Issues are formatted with GitHub Flavored Markdown (GFM):
@@ -372,7 +378,11 @@ On <%= repo %>
 <%= no_color { format_issue issue, columns - 2 if issue } %>
 EOF
       message.rstrip!
-      message.gsub!(/(?!\A)^.*$/) { |line| "# #{line}".rstrip }
+      message.gsub!(/(?!\A)^.*$/) { |line|
+        # unless line.empty?
+        "# #{line}".rstrip
+        # end
+      }
       message.insert 0, [
         issue['title'] || issue[:title], issue['body'] || issue[:body]
       ].compact.join("\n\n") if issue
@@ -403,9 +413,9 @@ EOF
     def format_comment_editor issue, comment = nil
       message = ERB.new(<<EOF).result binding
 
-Leave a comment. The first line will become the title. Trailing lines starting
-with '#' (like these) will be ignored, and empty messages will not be
-submitted. Comments are formatted with GitHub Flavored Markdown (GFM):
+Leave a comment. Trailing lines starting with '#' (like these) will be ignored, 
+and empty messages will not be submitted. Comments are formatted with GitHub 
+Flavored Markdown (GFM):
 
   http://github.github.com/github-flavored-markdown
 

data/lib/ghi/formatting/colors.rb

@@ -331,7 +331,11 @@ module GHI
             lang   = code_block['lang']
             code   = code_block['code']
 
-            output = pygmentize(lang, code)
+            if lang != ""
+              output = pygmentize(lang, code)
+            else
+              output = code
+            end
             with_indentation(output, indent)
           rescue
             code_block

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ghi
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 1.0.2
 platform: ruby
 authors:
 - Stephen Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2015-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -56,13 +56,16 @@ files:
 - lib/ghi/commands/command.rb
 - lib/ghi/commands/comment.rb
 - lib/ghi/commands/config.rb
+- lib/ghi/commands/disable.rb
 - lib/ghi/commands/edit.rb
+- lib/ghi/commands/enable.rb
 - lib/ghi/commands/help.rb
 - lib/ghi/commands/label.rb
 - lib/ghi/commands/list.rb
 - lib/ghi/commands/milestone.rb
 - lib/ghi/commands/open.rb
 - lib/ghi/commands/show.rb
+- lib/ghi/commands/status.rb
 - lib/ghi/commands/version.rb
 - lib/ghi/editor.rb
 - lib/ghi/formatting.rb
@@ -88,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: GitHub Issues command line interface