cp8_cli 6.0.1 → 8.0.0

data/lib/cp8_cli/github/issue.rb

@@ -1,68 +1,47 @@
-require "cp8_cli/github/base"
+require "cp8_cli/github/api"
 require "cp8_cli/github/parsed_url"
-require "cp8_cli/github/parsed_short_link"
-require "cp8_cli/storyable"
+require "cp8_cli/story"
 
 module Cp8Cli
   module Github
-    class Issue < Base
-      include Storyable
+    class Issue < Story
+      include Api::Client
 
-      def initialize(number:, repo:, attributes:)
+      def initialize(number:, repo:, **attributes)
         @number = number
         @repo = repo
         @attributes = attributes
       end
 
-      def self.fields
-        [:title]
-      end
-
       def self.find_by_url(url)
         url = ParsedUrl.new(url)
-        issue = client.issue(url.repo, url.number)
-        new number: url.number, repo: url.repo, attributes: issue
-      end
-
-      def self.find_by_short_link(short_link)
-        short_link = ParsedShortLink.new(short_link)
-        issue = client.issue(short_link.repo, short_link.number)
-        new number: short_link.number, repo: short_link.repo, attributes: issue
+        issue = client.issue(url.repo, url.number).to_h
+        new issue.merge(number: url.number, repo: url.repo)
       end
 
       def title
         attributes[:title]
       end
 
-      def pr_title
-        title
-      end
-
-      def url
-        attributes[:html_url]
-      end
-
       def summary
         "Closes #{short_link}"
       end
 
-      def start
-        assign CurrentUser.new
-      end
-
-      def short_link
-        "#{repo}##{number}"
-      end
-
       private
 
         attr_reader :number, :repo, :attributes
 
-        def assign(user)
-          # add_assignes not released as gem yet https://github.com/octokit/octokit.rb/pull/894
-          client.post "#{Octokit::Repository.path repo}/issues/#{number}/assignees", assignees: [user.github_login]
+        def assign
+          client.add_assignees repo, number, [user.github_login]
         end
 
+        def user
+          CurrentUser.new
+        end
+
+        def short_link
+          "#{repo}##{number}"
+        end
     end
   end
 end

data/lib/cp8_cli/github/pull_request.rb

@@ -1,24 +1,31 @@
-require "cp8_cli/github/base"
+require "cp8_cli/github/api"
 require "cp8_cli/repo"
 
 module Cp8Cli
   module Github
-    class PullRequest < Base
+    class PullRequest
+      include Api::Client
+
       def self.create(attributes = {})
         new(attributes).save
       end
 
-      def initialize(from:, to:, title: nil, body: nil)
-        @title = title
-        @body = body
+      def self.find_by(repo:, branch:)
+        client.pull_requests(repo, head: branch).map do |data|
+          new(data)
+        end.first
+      end
+
+      def initialize(from: nil, to: "master", title: nil, body: nil, expand: 1, html_url: nil, **attributes)
         @from = from
         @to = to
+        @title = title
+        @body = body
+        @expand = expand
+        @html_url = html_url
       end
 
-      def open(expand: 1)
-        query = base_query.merge(expand: expand)
-        url = "#{base_url}?#{query.compact.to_query}"
-
+      def open
         Command.open_url(url)
       end
 
@@ -34,7 +41,15 @@ module Cp8Cli
 
       private
 
-        attr_reader :from, :to, :title, :body
+        attr_reader :from, :to, :title, :body, :expand, :html_url
+
+        def url
+          html_url || new_pr_url
+        end
+
+        def new_pr_url
+          "#{base_url}?#{base_query}"
+        end
 
         def base_url
           repo.url + "/compare/#{escape to}...#{escape from}"
@@ -44,7 +59,8 @@ module Cp8Cli
           {
             title: title,
             body: body,
-          }
+            expand: expand
+          }.compact.to_query
         end
 
         def escape(text)

data/lib/cp8_cli/global_config.rb

@@ -1,5 +1,4 @@
 require "cp8_cli/config_store"
-require "cp8_cli/trello/base"
 
 module Cp8Cli
   class GlobalConfig
@@ -9,14 +8,6 @@ module Cp8Cli
       @store = store || ConfigStore.new(PATH)
     end
 
-    def trello_key
-      @_trello_key ||= store[:key] || configure_trello_key
-    end
-
-    def trello_token
-      @_trello_token ||= store[:token] || configure_trello_token
-    end
-
     def github_token
       @_github_token ||= store[:github_token] || env_github_token || configure_github_token
     end
@@ -25,17 +16,6 @@ module Cp8Cli
 
       attr_reader :store
 
-      def configure_trello_key
-        Command.ask "Press enter to setup Trello for this project (will open public key url)", validate: //
-        Command.open_url "https://trello.com/app-key"
-        store.save :key, Command.ask("Input Developer API key")
-      end
-
-      def configure_trello_token
-        Command.open_url trello_authorize_url
-        store.save :token, Command.ask("Input member token")
-      end
-
       def env_github_token
         ENV["OCTOKIT_ACCESS_TOKEN"]
       end
@@ -43,9 +23,5 @@ module Cp8Cli
       def configure_github_token
         store.save :github_token, Command.ask("Input GitHub token")
       end
-
-      def trello_authorize_url
-        "https://trello.com/1/authorize?key=#{trello_key}&name=Trello-Flow&scope=read,write,account&expiration=never&response_type=token"
-      end
   end
 end

data/lib/cp8_cli/main.rb

@@ -9,8 +9,7 @@ require "cp8_cli/commands/suggest"
 module Cp8Cli
   class Main
     def initialize(global_config = GlobalConfig.new)
-      Trello::Base.configure(key: global_config.trello_key, token: global_config.trello_token)
-      Github::Base.configure(token: global_config.github_token)
+      Github::Api.configure(token: global_config.github_token)
     end
 
     def start(name)

data/lib/cp8_cli/pull_request_body.rb

@@ -5,7 +5,7 @@ module Cp8Cli
     end
 
     def run
-      return unless story
+      return if story.summary.blank?
 
       summary_with_release_note
     end

data/lib/cp8_cli/pull_request_title.rb

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

data/lib/cp8_cli/repo.rb

@@ -9,14 +9,6 @@ module Cp8Cli
       @path = path
     end
 
-    def user
-      path.split('/').first
-    end
-
-    def name
-      path.split('/').last
-    end
-
     def shorthand
       "#{user}/#{name}"
     end
@@ -28,5 +20,13 @@ module Cp8Cli
     private
 
       attr_reader :path
+
+      def user
+        path.split('/').first
+      end
+
+      def name
+        path.split('/').last
+      end
   end
 end

data/lib/cp8_cli/story.rb

@@ -0,0 +1,54 @@
+module Cp8Cli
+  class Story
+    def start
+      checkout_branch
+      create_empty_commit
+      push_branch
+      create_wip_pull_request
+      assign
+      Command.say "Created WIP PR, run `cp8 open` to view."
+    end
+
+    private
+
+      def checkout_branch
+        branch.checkout
+      end
+
+      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(
+          from: branch.name,
+          title: PullRequestTitle.new(title, prefixes: :wip).run,
+          body: PullRequestBody.new(self).run
+        )
+      end
+
+      def branch
+        @_branch ||= Branch.new(branch_name)
+      end
+
+      def branch_name
+        BranchName.new(user: user, story: self).to_s
+      end
+
+      def user
+        @_user ||= CurrentUser.new
+      end
+  end
+end

data/lib/cp8_cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cp8_cli
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 8.0.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday-conductivity
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,48 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: hirb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: hirb-colors
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: hirb-unicode
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -220,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -249,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: spyke
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -263,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -277,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -328,9 +272,8 @@ files:
 - lib/cp8_cli/commands/suggest.rb
 - lib/cp8_cli/config_store.rb
 - lib/cp8_cli/current_user.rb
-- lib/cp8_cli/github/base.rb
+- lib/cp8_cli/github/api.rb
 - lib/cp8_cli/github/issue.rb
-- lib/cp8_cli/github/parsed_short_link.rb
 - lib/cp8_cli/github/parsed_url.rb
 - lib/cp8_cli/github/pull_request.rb
 - lib/cp8_cli/global_config.rb
@@ -338,19 +281,7 @@ files:
 - lib/cp8_cli/pull_request_body.rb
 - lib/cp8_cli/pull_request_title.rb
 - lib/cp8_cli/repo.rb
-- lib/cp8_cli/story_query.rb
-- lib/cp8_cli/storyable.rb
-- lib/cp8_cli/table.rb
-- lib/cp8_cli/table/row.rb
-- lib/cp8_cli/trello/base.rb
-- lib/cp8_cli/trello/board.rb
-- lib/cp8_cli/trello/card.rb
-- lib/cp8_cli/trello/error.rb
-- lib/cp8_cli/trello/error_handler.rb
-- lib/cp8_cli/trello/json_parser.rb
-- lib/cp8_cli/trello/label.rb
-- lib/cp8_cli/trello/list.rb
-- lib/cp8_cli/trello/member.rb
+- lib/cp8_cli/story.rb
 - lib/cp8_cli/version.rb
 homepage: https://github.com/balvig/cp8_cli
 licenses:
@@ -372,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Cookpad Global CLI.