github_flow_cli 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9633c88cccd1c1b03e580103af026d44a552868a
-  data.tar.gz: 6c73adb56a7b5005e3ba2c1de86eb24d52e4a548
+  metadata.gz: b5abdfc79058f475a76efa21e46941c246aa7bd2
+  data.tar.gz: 9f3cea48ab06b373bba56641c2ebd8d6bce3c660
 SHA512:
-  metadata.gz: acec134668969e53a5cafc784e4474a94790c8968f51308041fcc88ca1a0584907b7eef2d41671e187da4215ed69bd04a920d8d3ebc3df1fed3471caae542da0
-  data.tar.gz: 0d93d9983cb2ec00429a267184d45ff914250f29824f472e9330e93f164a081aa8976b1acd06cafa7ccf762a6d207712b9b9a889421d3155a5c56a71524dc7a7
+  metadata.gz: 20b9e79a527f2aa9b712837f55b646a481c724d1c36b7f548e01b3a24b199a695bac49954a124452e28cf1c3a5a91072a2d82225d611b7463bbeb02e8ee6e115
+  data.tar.gz: 202531dc42b3b330b17459995ddbf93d4bc35d8b6cd8e7608836be5be0008cc05c192e2009e6f0c108a5644ce005c03308eebb5def86a530380f6f67f3504d3f

data/.gitignore

@@ -8,3 +8,4 @@
 /tmp/
 .byebug_history
 .rspec_status
+.idea/

data/Gemfile.lock

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

data/exe/hubflow

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

data/lib/github_flow_cli/api.rb

@@ -2,87 +2,86 @@ require 'octokit'
 require_relative 'local'
 
 module GithubFlowCli
-  class API
-    class << self
-      # @return [String] OAuth token
-      def authorize(username, password, two_factor_token: nil)
-        client = Octokit::Client.new(login: username, password: password)
-        auth_config = {
-          scopes: ['user', 'repo', 'admin:repo_hook'],
-          note: app_name,
-        }
-        if two_factor_token
-          auth_config.merge!(:headers => { "X-GitHub-OTP" => two_factor_token })
-        end
-        client.create_authorization(auth_config).token
-      rescue Octokit::UnprocessableEntity => ex
-        if ex.message =~ /already_exists/
-          id = client.authorizations.find { |auth| auth[:note] == app_name }.id
-          client.delete_authorization(id)
-          retry
-        else
-          raise
-        end
+  class API; end
+  class << API
+    # @return [String] OAuth token
+    def authorize(username, password, two_factor_token: nil)
+      client = Octokit::Client.new(login: username, password: password)
+      auth_config = {
+        scopes: ['user', 'repo', 'admin:repo_hook'],
+        note: app_name,
+      }
+      if two_factor_token
+        auth_config.merge!(:headers => { "X-GitHub-OTP" => two_factor_token })
       end
-
-      def use_oauth_token(token)
-        @client = Octokit::Client.new(access_token: token)
+      client.create_authorization(auth_config).token
+    rescue Octokit::UnprocessableEntity => ex
+      if ex.message =~ /already_exists/
+        id = client.authorizations.find { |auth| auth[:note] == app_name }.id
+        client.delete_authorization(id)
+        retry
+      else
+        raise
       end
+    end
 
-      def valid?
-        !user[:login].nil?
-      rescue Octokit::Unauthorized
-        false
-      end
+    def use_oauth_token(token)
+      @client = Octokit::Client.new(access_token: token)
+    end
+
+    def valid?
+      !user[:login].nil?
+    rescue Octokit::Unauthorized
+      false
+    end
 
-      # delegate API calls to Octokit::Client
-      def method_missing(method, *args, &block)
-        if @client.respond_to?(method)
-          define_singleton_method(method) do |*args, &block|
-            @client.send(method, *args, &block)
-          end
-          return send(method, *args, &block)
+    # delegate API calls to Octokit::Client
+    def method_missing(method, *args, &block)
+      if @client.respond_to?(method)
+        define_singleton_method(method) do |*args, &block|
+          @client.send(method, *args, &block)
         end
-        super
+        return send(method, *args, &block)
       end
+      super
+    end
 
-      # TODO: explicify options
-      # :assignee (String) — User login.
-      # :milestone (Integer) — Milestone number.
-      # :labels
-      # TODO: keywordify parameters
-      def create_issue(title, body = nil, options = {})
-        @client.create_issue(Local.repo, title, body, options)
-      end
+    # TODO: explicify options
+    # :assignee (String) — User login.
+    # :milestone (Integer) — Milestone number.
+    # :labels
+    # TODO: keywordify parameters
+    def create_issue(title, body = nil, options = {})
+      @client.create_issue(Local.repo, title, body, options)
+    end
 
-      # TODO: other options
-      def create_pr(base: "master", title: nil, body: nil)
-        branch_name = Local.git.current_branch
-        issue_number = Config.branch_issue_map[branch_name]
-        if issue_number
-          issue = API.issue(Local.repo, issue_number)
-          title ||= issue.title
-          body ||= issue.body
-        end
-        unless Local.git.branches.remote.find { |b| b.name == branch_name }
-          # TODO: custom default remote
-          puts "no remote branch found, creating remote branch..."
-          Local.git.config("branch.#{branch_name}.remote", 'origin')
-          Local.git.config("branch.#{branch_name}.merge", "refs/heads/#{branch_name}")
-        end
+    # TODO: other options
+    def create_pr(base: "master", title: nil, body: nil)
+      branch_name = Local.git.current_branch
+      issue_number = Config.branch_issue_map[branch_name]
+      if issue_number
+        issue = API.issue(Local.repo, issue_number)
+        title ||= issue.title
+        body ||= issue.body
+      end
+      unless Local.git.branches.remote.find { |b| b.name == branch_name }
         # TODO: custom default remote
-        puts "git push..."
-        Local.git.push('origin', branch_name)
-        @client.create_pull_request(Local.repo, base, branch_name, title, body).tap do |pr|
-          Config.link_pr_to_branch(pr, branch_name)
-        end
+        puts "no remote branch found, creating remote branch..."
+        Local.git.config("branch.#{branch_name}.remote", 'origin')
+        Local.git.config("branch.#{branch_name}.merge", "refs/heads/#{branch_name}")
+      end
+      # TODO: custom default remote
+      puts "git push..."
+      Local.git.push('origin', branch_name)
+      @client.create_pull_request(Local.repo, base, branch_name, title, body).tap do |pr|
+        Config.link_pr_to_branch(pr, branch_name)
       end
+    end
 
-      private
+    private
 
-      def app_name
-        "hubflow for #{`whoami`.strip}@#{`hostname`.strip}"
-      end
+    def app_name
+      "hubflow for #{`whoami`.strip}@#{`hostname`.strip}"
     end
   end
 end

data/lib/github_flow_cli/config.rb

@@ -4,59 +4,58 @@ require_relative 'api'
 require_relative 'local'
 
 module GithubFlowCli
-  class Config
+  class Config; end
+  class << Config
     CONFIG_DIR = File.expand_path('~/.config')
     CONFIG_FILE = 'hubflow'
     KEYS = %w[username oauth_token branch_issue_map pr_branch_map]
 
-    class << self
-      attr_accessor *KEYS
-
-      def setup
-        if File.file?(config_path)
-          load
-          API.use_oauth_token(oauth_token)
-          unless API.valid?
-            puts "WARN: authentication failed, please retry login."
-            File.delete(config_path)
-            exit(1)
-          end
-        else
-          puts "please login first."
-          exit(2)
+    attr_accessor *KEYS
+
+    def setup
+      if File.file?(config_path)
+        load
+        API.use_oauth_token(oauth_token)
+        unless API.valid?
+          puts "WARN: authentication failed, please retry login."
+          File.delete(config_path)
+          exit(1)
         end
+      else
+        puts "please login first."
+        exit(2)
       end
+    end
 
-      def link_branch_to_issue(branch_name, issue)
-        self.branch_issue_map[branch_name] = issue.number
-      end
+    def link_branch_to_issue(branch_name, issue)
+      self.branch_issue_map[branch_name] = issue.number
+    end
 
-      def link_pr_to_branch(pr, branch_name)
-        self.pr_branch_map[pr.number] = branch_name
-      end
+    def link_pr_to_branch(pr, branch_name)
+      self.pr_branch_map[pr.number] = branch_name
+    end
 
-      def load
-        YAML::load_file(config_path).each { |k, v| send("#{k}=", v) }
-      end
+    def load
+      YAML::load_file(config_path).each { |k, v| send("#{k}=", v) }
+    end
 
-      def save!
-        self.branch_issue_map ||= {}
-        self.pr_branch_map ||= {}
-        File.open(config_path, 'w') { |f| f.write(to_h.to_yaml) }
-      end
+    def save!
+      self.branch_issue_map ||= {}
+      self.pr_branch_map ||= {}
+      File.open(config_path, 'w') { |f| f.write(to_h.to_yaml) }
+    end
 
-      def to_h
-        KEYS.map{ |k| [k, send(k)] }.to_h
-      end
+    def to_h
+      KEYS.map{ |k| [k, send(k)] }.to_h
+    end
 
-      def valid?
-        KEYS.all? { |c| send(c) }
-      end
+    def valid?
+      KEYS.all? { |c| send(c) }
+    end
 
-      def config_path
-        FileUtils.mkdir_p(CONFIG_DIR) unless File.directory?(CONFIG_DIR)
-        File.join(CONFIG_DIR, CONFIG_FILE)
-      end
+    def config_path
+      FileUtils.mkdir_p(CONFIG_DIR) unless File.directory?(CONFIG_DIR)
+      File.join(CONFIG_DIR, CONFIG_FILE)
     end
   end
 end

data/lib/github_flow_cli/local.rb

@@ -1,34 +1,33 @@
 require 'git'
 
 module GithubFlowCli
-  class Local
-    class << self
-      def repo
-        return @repo if @repo
-        url = git.remote.url
-        match = url&.match(%r{.*[:/](?<owner>.*?)/(?<name>.*?)\.git$})
-        return nil unless match && match[:owner] && match[:name]
-        @repo = Octokit::Repository.from_url("/#{match[:owner]}/#{match[:name]}")
-      rescue ArgumentError => ex
-        if ex.message =~ /path does not exist/
-          nil
-        else
-          raise
-        end
+  class Local; end
+  class << Local
+    def repo
+      return @repo if @repo
+      url = git.remote.url
+      match = url&.match(%r{.*[:/](?<owner>.*?)/(?<name>.*?)(\.git)?$})
+      return nil unless match && match[:owner] && match[:name]
+      @repo = Octokit::Repository.from_url("/#{match[:owner]}/#{match[:name]}")
+    rescue ArgumentError => ex
+      if ex.message =~ /path does not exist/
+        nil
+      else
+        raise
       end
+    end
 
-      def git
-        @git ||= Git.open(git_dir)
-      end
+    def git
+      @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
+    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.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_flow_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Yang Liu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets