github_flow_cli 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b2e3063e075d387e29e4f05f4627dfb664f3279
-  data.tar.gz: a1f32725fe4bbffac54db69dad958ca587269e57
+  metadata.gz: 5a44a07d009f36c0f65a79e8b9e509864f3f08f7
+  data.tar.gz: 34229676929d20b34624c342a1beba61f76f72fb
 SHA512:
-  metadata.gz: f3b3ce0879fafd58cdcea2feb2233865c7e066f15dc1824af38d2dfd20cbce42f75dab50d64ca1dddc1ea63ada3eece4d6c3f948bd91fcbbbf47c263bcdeceb8
-  data.tar.gz: 667647cc1f3a1dcce5a9532b50eb696d577db8419ab126534cd71386ef8e02e5e6a2d0591e084d411f75e5e18e87b0c6b3f9b776a5413e40cb65df6d1ec0551d
+  metadata.gz: cd2c5b01196984c29d06984db654471418ec2d834a58bfa687f492a3990a77da28284ca4435941458e0902d8e84e8a335b26eb0de8fae279e5039a1781ef3a53
+  data.tar.gz: f107a08bf3fafe3690f442e2a9636d97a106c977bf17009b353d82f2af1f764fe16904c685961bbe8216da9e98ef460eeeab471f3822d8638c2f3973f9832d62

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    github_flow_cli (0.1.1)
+    github_flow_cli (0.1.2)
       facets
       git
       octokit

data/README.md

@@ -24,6 +24,8 @@ For the very first version, I present a workflow that is 100% browser-free until
 
 ![image](https://user-images.githubusercontent.com/3524125/40894925-82156c58-6761-11e8-9f21-2d467426bd58.png)
 
+First make sure your working directory is under a git repository.
+
 1. When you're in ready position, check your ticket list via `hubflow issue mine`;
 2. Pick a ticket to work on via `hubflow issue start NUMBER`, this will create a branch based on the issue number and name;
 3. After you finished your work, just hit `hubflow pr create`, it will:

data/exe/hubflow

@@ -6,7 +6,5 @@ begin
 rescue Interrupt => e
   puts "\nbye."
 ensure
-  if GithubFlowCli::Config.valid?
-    GithubFlowCli::Config.save!
-  end
+  GithubFlowCli::Config.save!
 end

data/lib/commands/issue.rb

@@ -28,6 +28,11 @@ module GithubFlowCli
 
     desc "start", "create a new branch named after the issue"
     def start(number)
+      # TODO: before filer
+      unless Local.repo
+        puts "not valid outside of a git repo."
+        exit(4)
+      end
       issue = API.issue(Local.repo, number)
       # TODO: create branch based on RepoRules
       # TODO: abstarct tag from issue title
@@ -44,7 +49,9 @@ module GithubFlowCli
       show_assignee = config.delete(:show_assignee)
       issues = API.list_issues(Local.repo, config)
       unless issues.empty?
-        puts issues.sort_by(&:title).map { |i| "##{i.number}#{assignee_field(show_assignee, i)}: #{i.title}" }.join("\n")
+        msgs = issues.sort_by(&:title).map { |i| "#{Local.repo ? '' : i.repository.name}##{i.number}#{assignee_field(show_assignee, i)}: #{i.title}" }
+        msgs.sort_by!(&:itself) unless Local.repo
+        puts msgs
       end
     end
 

data/lib/commands/pr.rb

@@ -6,14 +6,24 @@ module GithubFlowCli
   class PrCommands < Thor
     desc "all", "list all open PR"
     def all
+      # TODO: before filer
+      unless Local.repo
+        puts "not valid outside of a git repo."
+        exit(4)
+      end
       pull_requests = API.pull_requests(Local.repo)
       unless pull_requests.empty?
-        puts pull_requests.map { |p| "##{p.number} (#{p.assignee&.login || "NONE"}): #{p.title}" }
+        puts pull_requests.map { |p| "#{Local.repo ? '' : i.repository.name}##{p.number} (#{p.assignee&.login || "NONE"}): #{p.title}" }
       end
     end
 
     desc "create TITLE", "create PR from current branch"
     def create(title = nil)
+      # TODO: before filer
+      unless Local.repo
+        puts "not valid outside of a git repo."
+        exit(4)
+      end
       puts API.create_pr(title: title).html_url
     rescue Octokit::UnprocessableEntity => ex
       case ex.message
@@ -23,6 +33,8 @@ module GithubFlowCli
         puts "PR already exists."
         pr_number = Config.pr_branch_map.find {|_, v| v == Local.git.current_branch }.first
         puts API.pull_request(Local.repo, pr_number).html_url
+      when /missing_field/
+        puts "issue info lost, please provide the title"
       else
         raise
       end

data/lib/github_flow_cli/cli.rb

@@ -12,7 +12,6 @@ module GithubFlowCli
       Config.username = ask("Github username:")
       password = ask("password:", echo: false)
       Config.oauth_token = authorize(Config.username, password)
-      Config.save!
       puts "\nsuccessfully login!"
     rescue Octokit::Unauthorized
       puts "\nauthentication failed, please try again."

data/lib/github_flow_cli/config.rb

@@ -13,8 +13,6 @@ module GithubFlowCli
       attr_accessor *KEYS
 
       def setup
-        self.branch_issue_map = {}
-        self.pr_branch_map = {}
         if File.file?(config_path)
           load
           API.use_oauth_token(oauth_token)
@@ -42,6 +40,8 @@ module GithubFlowCli
       end
 
       def save!
+        self.branch_issue_map ||= {}
+        self.pr_branch_map ||= {}
         File.open(config_path, 'w') { |f| f.write(to_h.to_yaml) }
       end
 

data/lib/github_flow_cli/local.rb

@@ -18,7 +18,16 @@ module GithubFlowCli
       end
 
       def git
-        @git ||= Git.open(File.expand_path('.'))
+        @git ||= Git.open(git_dir)
+      end
+
+      def git_dir
+        current = File.expand_path('.')
+        while !File.directory?(File.join(current, '.git'))
+          current = File.dirname(current)
+          break if current == '/'
+        end
+        current
       end
     end
   end

data/lib/github_flow_cli/version.rb

@@ -1,3 +1,3 @@
 module GithubFlowCli
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github_flow_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Yang Liu