cp8_cli 6.0.1 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3ff52745a24efe4e1b23b61a30f2b88bd5d9691
-  data.tar.gz: 1ac607e96ed473335468195e39495bc620257938
+  metadata.gz: 1f89f5cef49c8003d4e122a20839552d4f2f9356
+  data.tar.gz: cb65a62d4e2106f1c257fb975f2e153eeb23bb71
 SHA512:
-  metadata.gz: ae8d41a0bcce0d76d92ecfe57cafc83289477d7364484c775fe5ffcf25ee1d90242d845923e40b0b7a909481226d74ae3c8024e433107fd474771f14b5e62fb7
-  data.tar.gz: 613234213ce6fb3e8f6a5f2c1434ea1eb71af9ae2bd821a27e8c01d6e1f9e0b17495751697a2d96f52ee3a824d713200865dffe8ab9c6e48cb37bfb6109addd5
+  metadata.gz: ea264e71c5e44e09b69497ea494b8ae841361cfa97809238d2877d837efbcb9abf1f9a28da777d91e9f779fd53adc514364fbde7e12021137bb7e85e7af2b7b1
+  data.tar.gz: 21de39da770d3d3cd563fc606a1552b10328aec458e5475d14f4bc47cc4d618e67d8f568366835d3bfe33150a5df4aa43941317bde3c6ecc3c8ab33827b51d22

data/README.md

@@ -3,7 +3,6 @@
 ## Installation
 
 ```bash
-gem uninstall trello_flow # if used
 gem install cp8_cli
 ```
 

data/cp8_cli.gemspec

@@ -25,19 +25,15 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest-line"
   spec.add_development_dependency "minitest-reporters"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "multi_json"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "faraday-conductivity"
 
   spec.add_dependency "activesupport"
   spec.add_dependency "colored"
   spec.add_dependency "highline"
-  spec.add_dependency "hirb"
-  spec.add_dependency "hirb-colors"
-  spec.add_dependency "hirb-unicode"
   spec.add_dependency "launchy"
-  spec.add_dependency "multi_json"
   spec.add_dependency "octokit"
-  spec.add_dependency "spyke"
   spec.add_dependency "thor"
   spec.add_dependency "trollop"
+  spec.add_dependency "tty-prompt"
 end

data/exe/cp8

@@ -12,13 +12,12 @@ module Cp8Cli
       main.start(name)
     end
 
-    desc "submit", "Pushes branch to GitHub and opens a PR"
-    method_option :wip, desc: "Flag PR as WIP", type: :boolean
+    desc "submit", "Pushes branch to GitHub and opens PR"
     def submit
-      main.submit(options.to_h.symbolize_keys)
+      main.submit
     end
 
-    desc "open", "Open current associated issue in browser"
+    desc "open", "Open current associated PR in browser"
     def open
       main.open
     end

data/lib/cp8_cli.rb

@@ -1,6 +1,5 @@
 require "cp8_cli/version"
 require "cp8_cli/command"
-require "cp8_cli/table"
 require "cp8_cli/branch"
 require "cp8_cli/main"
 

data/lib/cp8_cli/adhoc_story.rb

@@ -1,8 +1,7 @@
-require "cp8_cli/storyable"
+require "cp8_cli/story"
 
 module Cp8Cli
-  class AdhocStory
-    include Storyable
+  class AdhocStory < Story
     attr_reader :title
 
     def initialize(title)
@@ -10,47 +9,17 @@ module Cp8Cli
     end
 
     def summary
-      nil # noop for now
+      # noop
     end
 
-    def start
-      create_empty_commit
-      push_branch
-      create_wip_pull_request
-    end
-
-    def short_link
-      nil # noop for now
-    end
-
-    def pr_title
-      PullRequestTitle.new(title, prefixes: [:wip]).run
+    def url
+      "#{Repo.current.url}/tree/#{Branch.current}"
     end
 
     private
 
-      def create_empty_commit
-        Command.run "git commit --allow-empty -m\"#{commit_message}\""
-      end
-
-      def commit_message
-        "Started: #{escaped_title}"
-      end
-
-      def escaped_title
-        title.gsub('"', '\"')
-      end
-
-      def push_branch
-        branch.push
-      end
-
-      def create_wip_pull_request
-        Github::PullRequest.create(
-          title: pr_title,
-          from: branch.name,
-          to: branch.target
-        )
+      def assign
+        # noop
       end
   end
 end

data/lib/cp8_cli/branch.rb

@@ -3,7 +3,6 @@ require "cp8_cli/ci"
 require "cp8_cli/github/pull_request"
 require "cp8_cli/branch_name"
 require "cp8_cli/current_user"
-require "cp8_cli/story_query"
 require "cp8_cli/pull_request_title"
 require "cp8_cli/pull_request_body"
 
@@ -24,19 +23,6 @@ module Cp8Cli
       new("suggestion-#{SecureRandom.hex(8)}")
     end
 
-    def self.from_story(story)
-      new BranchName.new(
-        user: CurrentUser.new,
-        target: current,
-        title: story.title,
-        short_link: story.short_link
-      ).to_s
-    end
-
-    def story
-      @_story ||= StoryQuery.new(short_link).find if short_link
-    end
-
     def checkout
       Command.run "git checkout #{name} >/dev/null 2>&1 || git checkout -b #{name}"
     end
@@ -45,20 +31,12 @@ module Cp8Cli
       Command.run "git push origin #{name} -u"
     end
 
-    def open_ci
-      Ci.new(branch_name: name, repo: Repo.current).open
+    def open_pr
+      pull_request.open
     end
 
-    def open_story_in_browser
-      if story
-        Command.open_url story.url
-      else
-        Command.error "Not currently on story branch"
-      end
-    end
-
-    def target
-      name_parts[2] || "master"
+    def open_ci
+      Ci.new(branch_name: name, repo: repo).open
     end
 
     def reset
@@ -75,22 +53,24 @@ module Cp8Cli
 
     private
 
-      def short_link
-        return unless linked_branch?
+      def repo
+        Repo.current
+      end
 
-        name_parts.last
+      def dirty?
+        Command.read("git status --porcelain")
       end
 
-      def linked_branch?
-        name_parts.size == 4
+      def pull_request
+        existing_pull_request || new_pull_request
       end
 
-      def name_parts
-        @_name_parts ||= name.split(".")
+      def existing_pull_request
+        Github::PullRequest.find_by(branch: name, repo: repo.shorthand)
       end
 
-      def dirty?
-        Command.read("git status --porcelain")
+      def new_pull_request
+        Github::PullRequest.new(from: name)
       end
   end
 end

data/lib/cp8_cli/branch_name.rb

@@ -1,27 +1,30 @@
 module Cp8Cli
   class BranchName
-    def initialize(user:, target:, title:, short_link: nil)
+    SEPARATOR = "/"
+
+    def initialize(user:, story:)
       @user = user
-      @target = target
-      @title = title
-      @short_link = short_link
+      @story = story
     end
 
     def to_s
-      parts.join(".")
+      "#{prefix}#{user_input}"
     end
 
     private
 
-      attr_reader :user, :target, :title, :short_link
+      attr_reader :user, :story
+
+      def user_input
+        Command.ask("Branch name: #{prefix}", default: default)
+      end
+
+      def prefix
+        user.initials.downcase + SEPARATOR
+      end
 
-      def parts
-        parts = []
-        parts << user.initials.downcase
-        parts << title.parameterize[0..50]
-        parts << target
-        parts << short_link
-        parts.compact
+      def default
+        story.title.parameterize[0..50]
       end
   end
 end

data/lib/cp8_cli/ci.rb

@@ -14,7 +14,7 @@ module Cp8Cli
       attr_reader :branch_name, :repo
 
       def url
-        "https://circleci.com/gh/#{repo.user}/#{repo.name}/tree/#{escape branch_name}"
+        "https://circleci.com/gh/#{repo.shorthand}/tree/#{escape branch_name}"
       end
 
       def escape(text)

data/lib/cp8_cli/command.rb

@@ -1,22 +1,17 @@
 require "colored"
 require "active_support/core_ext/module/delegation"
 require "highline"
-require "hirb-colors"
-require "hirb"
+require "tty-prompt"
 
 module Cp8Cli
   class Command
     class << self
-      delegate :table, :open_url, :say, :success, :ask, :title, :error, :run, :read, to: :client
+      delegate :open_url, :say, :success, :ask, :title, :error, :run, :read, to: :client
       attr_accessor :client
     end
 
     self.client = new
 
-    def table(items)
-      puts Hirb::Helpers::AutoTable.render(items, unicode: true)
-    end
-
     def open_url(url)
       return title(url) if ENV['BROWSER'] == 'echo'
       `open \"#{url}\"`
@@ -30,8 +25,8 @@ module Cp8Cli
       highline.say(message.green.bold)
     end
 
-    def ask(message, type: nil, validate: /.+/)
-      highline.ask(message, type) { |q| q.validate = validate }
+    def ask(message, required: true, default: nil)
+      tty.ask(message, required: required, default: default)
     end
 
     def title(message)
@@ -57,5 +52,9 @@ module Cp8Cli
       def highline
         @_highline ||= HighLine.new
       end
+
+      def tty
+        @_tty ||= TTY::Prompt.new
+      end
   end
 end

data/lib/cp8_cli/commands/open.rb

@@ -2,7 +2,7 @@ module Cp8Cli
   module Commands
     class Open
       def run
-        Branch.current.open_story_in_browser
+        Branch.current.open_pr
       end
     end
   end

data/lib/cp8_cli/commands/start.rb

@@ -10,10 +10,11 @@ module Cp8Cli
 
       def run
         check_version
-        story.branch.checkout
-        story.start
-      rescue Trello::Error => error
-        Command.error(error.message)
+        if story
+          story.start
+        else
+          Command.error "No name/url provided"
+        end
       end
 
       private
@@ -33,12 +34,8 @@ module Cp8Cli
         def find_or_create_story
           if name.to_s.start_with?("https://github.com")
             Github::Issue.find_by_url(name)
-          elsif name.to_s.start_with?("http")
-            Trello::Card.find_by_url(name)
           elsif name.present?
             AdhocStory.new(name)
-          else
-            Command.error "No name/url provided"
           end
         end
     end

data/lib/cp8_cli/commands/submit.rb

@@ -7,7 +7,7 @@ module Cp8Cli
 
       def run
         branch.push
-        pull_request.open
+        branch.open_pr
       end
 
       private
@@ -17,15 +17,6 @@ module Cp8Cli
         def branch
           @_branch ||= Branch.current
         end
-
-        def pull_request
-          Github::PullRequest.new(
-            from: branch,
-            to: branch.target,
-            title: PullRequestTitle.new(branch.story&.pr_title, prefixes: options.keys).run,
-            body: PullRequestBody.new(branch.story).run
-          )
-        end
     end
   end
 end

data/lib/cp8_cli/commands/suggest.rb

@@ -7,7 +7,7 @@ module Cp8Cli
 
         suggestion_branch.checkout
         suggestion_branch.push
-        pull_request.open(expand: nil)
+        pull_request.open
 
         original_branch.checkout
         original_branch.reset
@@ -31,6 +31,7 @@ module Cp8Cli
           Github::PullRequest.new(
             from: suggestion_branch,
             to: original_branch,
+            expand: nil
           )
         end
 

data/lib/cp8_cli/config_store.rb

@@ -1,3 +1,5 @@
+require "yaml"
+
 module Cp8Cli
   class ConfigStore
     def initialize(path)

data/lib/cp8_cli/current_user.rb

@@ -1,17 +1,13 @@
+require "active_support/core_ext/string"
+
 module Cp8Cli
   class CurrentUser
-    def current
-      @_current ||= new
-    end
+    include Github::Api::Client
 
     def initials
       git_user_name.parameterize(separator: " ").split.map(&:first).join
     end
 
-    def trello_id
-      trello_user.id
-    end
-
     def github_login
       github_user.login
     end
@@ -23,11 +19,7 @@ module Cp8Cli
       end
 
       def github_user
-        @_github_user ||= Github::Base.client.user
-      end
-
-      def trello_user
-        @_trello_user ||= Trello::Member.current
+        @_github_user ||= client.user
       end
   end
 end

data/lib/cp8_cli/github/api.rb

@@ -0,0 +1,29 @@
+require "active_support"
+require "active_support/concern"
+require "octokit"
+
+module Cp8Cli
+  module Github
+    class Api
+      cattr_accessor :client
+
+      def self.configure(token:)
+        self.client = Octokit::Client.new(access_token: token)
+      end
+
+      module Client
+        extend ActiveSupport::Concern
+
+        def client
+          self.class.client
+        end
+
+        class_methods do
+          def client
+            Api.client
+          end
+        end
+      end
+    end
+  end
+end