cp8_cli 8.2.1 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1ff138421479066ef738c308282e9b57baab5e3e
-  data.tar.gz: cbc59c229cd35cb4bdf9f1c416b05b0fa768b820
+SHA256:
+  metadata.gz: 7814c1971d98c081f83039b7532cd09643310307b23563c04a6e4e67dc187861
+  data.tar.gz: fcdc9860f33add2f70ce25de66c3b70961516b21377d77cb538266af2a2d02e7
 SHA512:
-  metadata.gz: 570b56fd867b5c0c9230819b63c181674d014ba190e9170bc0147bc7c20102d9780b0b21f70c7f532dcf7013ea673ac72c46ae4b5da35755bcadd2dc3392f38f
-  data.tar.gz: 367fb70df2e7813794dbcd82de10d6eeeb7d39f252c00a4dd3c564aed362a141c1139ba1bea8d6bfcb2f1ea88124543dea24ed580903710e5c31fa0e79d4f3ce
+  metadata.gz: b57fc650a6714b0b27c297eee936a9ae62911586625e6ce340dc0a231170d973ee43d4b8da2895e30c1f1dd47773ee1102bb39cc5e4c401f23e7accb59c894d2
+  data.tar.gz: f8005a679e7740ed961ab48230a294af0ac78ba9c584515d36d0ad8d723c9b725a74ff4243b7f05d63f1f3ae2eaa7f7442c8fd4cd13b065a87355ab2193afba0

data/README.md

@@ -1,4 +1,7 @@
-# CP-8 Cli
+# CP8 Cli
+CP8 is a command line tool which aids in interacting with Github.
+
+CP8 helps you open draft pull requests, suggests branch names and opens your CI for a branch.
 
 ## Installation
 

data/cp8_cli.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "minitest-line"
   spec.add_development_dependency "minitest-reporters"
@@ -32,8 +32,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "colored"
   spec.add_dependency "highline"
   spec.add_dependency "launchy"
-  spec.add_dependency "octokit"
+  spec.add_dependency "octokit", "~> 4.18"
   spec.add_dependency "thor"
-  spec.add_dependency "trollop"
   spec.add_dependency "tty-prompt"
+  spec.add_dependency "os"
 end

data/exe/cp8

@@ -27,7 +27,7 @@ module Cp8Cli
       main.ci
     end
 
-    desc "suggest", "Creates a suggestion branch from new commits, pushes it, opens URL and resets `master` back to `origin/master`."
+    desc "suggest", "Creates a suggestion branch from new commits, pushes it, opens URL, and resets the base branch."
     def suggest
       main.suggest
     end

data/lib/cp8_cli/command.rb

@@ -2,6 +2,7 @@ require "colored"
 require "active_support/core_ext/module/delegation"
 require "highline"
 require "tty-prompt"
+require "os"
 
 module Cp8Cli
   class Command
@@ -14,7 +15,7 @@ module Cp8Cli
 
     def open_url(url)
       return title(url) if ENV['BROWSER'] == 'echo'
-      `open \"#{url}\"`
+      `#{OS.open_file_command} \"#{url}\"`
     end
 
     def title(message)

data/lib/cp8_cli/config_store.rb

@@ -10,9 +10,18 @@ module Cp8Cli
       data[key]
     end
 
+    def exist?
+      File.exist?(path)
+    end
+
+    def move_to(new_path)
+      File.rename(path, new_path)
+      @path = new_path
+    end
+
     def save(key, value)
       data[key] = value
-      File.new(path, "w") unless File.exists?(path)
+      File.new(path, "w") unless exist?
       File.open(path, "w") { |f| f.write(data.to_yaml) }
       value
     end

data/lib/cp8_cli/current_user.rb

@@ -5,6 +5,7 @@ module Cp8Cli
     include Github::Api::Client
 
     def initials
+      Command.error("Please configure your git user.name using git config user.name Jane Doe") unless git_user_name
       git_user_name.parameterize(separator: " ").split.map(&:first).join
     end
 

data/lib/cp8_cli/github/issue.rb

@@ -16,7 +16,7 @@ module Cp8Cli
       def self.find_by_url(url)
         url = ParsedUrl.new(url)
         issue = client.issue(url.repo, url.number).to_h
-        new issue.merge(number: url.number, repo: url.repo)
+        new(**issue.merge(number: url.number, repo: url.repo))
       end
 
       def title

data/lib/cp8_cli/github/pull_request.rb

@@ -7,18 +7,18 @@ module Cp8Cli
       include Api::Client
 
       def self.create(attributes = {})
-        new(attributes).save
+        new(**attributes).save
       end
 
       def self.find_by(repo:, branch:)
         client.pull_requests(repo.shorthand, head: "#{repo.user}:#{branch}").map do |data|
-          new(data)
+          new(**data)
         end.first
       end
 
-      def initialize(from: nil, to: "master", title: nil, body: nil, expand: 1, html_url: nil, **attributes)
+      def initialize(from: nil, to: nil, title: nil, body: nil, expand: 1, html_url: nil, **attributes)
         @from = from
-        @to = to
+        @to = to || default_branch
         @title = title
         @body = body
         @expand = expand
@@ -35,7 +35,9 @@ module Cp8Cli
           to,
           from,
           title,
-          body
+          body,
+          draft: true,
+          accept: "application/vnd.github.shadow-cat-preview" # waiting for https://github.com/octokit/octokit.rb/pull/1114
         )
       end
 
@@ -43,6 +45,10 @@ module Cp8Cli
 
         attr_reader :from, :to, :title, :body, :expand, :html_url
 
+        def default_branch
+          client.repo(repo.shorthand).default_branch
+        end
+
         def url
           html_url || new_pr_url
         end

data/lib/cp8_cli/global_config.rb

@@ -2,10 +2,11 @@ require "cp8_cli/config_store"
 
 module Cp8Cli
   class GlobalConfig
-    PATH = ENV["HOME"] + "/.trello_flow"
+    LEGACY_PATH = ENV["HOME"] + "/.trello_flow"
+    PATH = ENV["HOME"] + "/.cp8_cli"
 
     def initialize(store = nil)
-      @store = store || ConfigStore.new(PATH)
+      @store = store || initialize_store
     end
 
     def github_token
@@ -16,12 +17,38 @@ module Cp8Cli
 
       attr_reader :store
 
+      def initialize_store
+        migrate_legacy_store if uses_legacy_store?
+
+        default_store
+      end
+
+      def uses_legacy_store?
+        legacy_store.exist?
+      end
+
+      def migrate_legacy_store
+        Command.say("#{LEGACY_PATH} was deprecated, moving to #{PATH}")
+        legacy_store.move_to(PATH)
+      end
+
+      def default_store
+        @_default_store ||= ConfigStore.new(PATH)
+      end
+
+      def legacy_store
+        @_legacy_store ||= ConfigStore.new(LEGACY_PATH)
+      end
+
       def env_github_token
         ENV["OCTOKIT_ACCESS_TOKEN"]
       end
 
       def configure_github_token
-        store.save :github_token, Command.ask("Input GitHub token")
+        store.save(
+          :github_token,
+          Command.ask("Input GitHub access token with repo access scope (https://github.com/settings/tokens):")
+        )
       end
   end
 end

data/lib/cp8_cli/pull_request_title.rb

@@ -2,7 +2,7 @@ module Cp8Cli
   class PullRequestTitle
     def initialize(title, prefixes: [])
       @title = title
-      @prefixes = Array(*prefixes)
+      @prefixes = Array(prefixes)
     end
 
     def run

data/lib/cp8_cli/story.rb

@@ -6,9 +6,9 @@ module Cp8Cli
       checkout_branch
       create_empty_commit
       push_branch
-      create_wip_pull_request
+      create_draft_pull_request
       assign
-      Command.title "Created WIP PR, run `cp8 open` to view."
+      Command.title "Created draft PR, run `cp8 open` to view."
     end
 
     private
@@ -33,10 +33,10 @@ module Cp8Cli
         branch.push
       end
 
-      def create_wip_pull_request
+      def create_draft_pull_request
         Github::PullRequest.create(
           from: branch.name,
-          title: PullRequestTitle.new(title, prefixes: :wip).run,
+          title: PullRequestTitle.new(title).run,
           body: PullRequestBody.new(self).run
         )
       end

data/lib/cp8_cli/version.rb

@@ -1,5 +1,5 @@
 module Cp8Cli
-  VERSION = "8.2.1"
+  VERSION = "9.1.0"
 
   class Version
     def self.latest?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cp8_cli
 version: !ruby/object:Gem::Version
-  version: 8.2.1
+  version: 9.1.0
 platform: ruby
 authors:
 - Jens Balvig
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -182,16 +182,16 @@ dependencies:
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.18'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tty-prompt
+  name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -239,10 +239,6 @@ email:
 - jens@balvig.com
 executables:
 - cp8
-- git-cleanup
-- git-finish
-- git-open
-- git-start
 extensions: []
 extra_rdoc_files: []
 files:
@@ -255,10 +251,6 @@ files:
 - Rakefile
 - cp8_cli.gemspec
 - exe/cp8
-- exe/git-cleanup
-- exe/git-finish
-- exe/git-open
-- exe/git-start
 - lib/cp8_cli.rb
 - lib/cp8_cli/adhoc_story.rb
 - lib/cp8_cli/branch.rb
@@ -287,7 +279,7 @@ homepage: https://github.com/balvig/cp8_cli
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -302,9 +294,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Cookpad Global CLI.
 test_files: []

data/exe/git-cleanup

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
-require "cp8_cli"
-
-Cp8Cli::Command.error "cleanup command has been removed, consider using https://github.com/Seinh/git-prune instead?"

data/exe/git-finish

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
-require "cp8_cli"
-require "trollop"
-
-
-options = Trollop::options do
-	banner <<-EOS
-Pushes branch to GitHub and opens a PR
-
-Usage:
-    git finish
-EOS
-  opt :wip, "Open [WIP] PR"
-end
-
-puts "git finish is DEPRECATED, please use cp8 submit".red
-Cp8Cli::Main.new.submit(options)

data/exe/git-open

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
-require "cp8_cli"
-
-puts "git open is DEPRECATED, please use cp8 open".red
-Cp8Cli::Main.new.open

data/exe/git-start

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
-require "cp8_cli"
-
-puts "git start is DEPRECATED, please use cp8 start".red
-Cp8Cli::Main.new.start(ARGV.first)