hustle_and_flow 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e0388db2dcb3bd47c54a5e03da9956cf4b7a85f
-  data.tar.gz: 4a59058b00ec6581f3cd0fc33bb8b6c0bb0fec09
+  metadata.gz: b208fd589872053209e23ac77b8dc192e2fff811
+  data.tar.gz: 2898d3598469cad68cd50403a514349991d5b90f
 SHA512:
-  metadata.gz: 48892f977a6e1a681caf40921f84c0761f9b8ec4de97b1715eefd95fe571c1aeb9b699334d408f48c33073bcd58b4ccb8fe73bfd4ab8b621e9f085d9fa8293cc
-  data.tar.gz: 0ea72b1ccb1cd67a9935b842eab8187cc5a61fa6caca0006b7801a9ac8badd65100a9d50922acafdf7e922f8d38dd4fd1ba09e469be43159679e516f82d6d7a3
+  metadata.gz: 090d2b0c0ae614290be17b94ab0981c20c2d9a5601f24ad6fc2beca83c917ddb5a198ad73cb07383506a335b4de0f4a62a8a82a5457b69f8c46fa4f3d41d3ada
+  data.tar.gz: 4a859cb4f997ee5a999b68d94b8217b1e0e7e33f7c5298363736891b337f3704cc85565d6381af141b5f996d64bb1810cfcbc5f2010969c8a0f82f1fe138dea7

data/bin/hustle

@@ -6,4 +6,9 @@ trap 'SIGINT' do
   exit 130
 end
 
-HustleAndFlow::Binary::Runner.start
+begin
+  HustleAndFlow::Binary::Runner.start
+rescue Git::GitExecuteError => e
+  io.say 'There was a problem running a git command.'
+  io.say e.message
+end

data/lib/hustle_and_flow/binary/runner.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require 'hustle_and_flow/commands/start'
+require 'hustle_and_flow/commands/ready'
 
 module  HustleAndFlow
 module  Binary
@@ -34,6 +35,22 @@ class   Runner < Thor
 
     Commands::Start.new(io: HustleAndFlow::Io::Shell.new, **symbolized_options).call
   end
+
+  desc 'ready', 'For when development on an issue is complete and ready to be merged'
+  method_option :number,
+                type:     :string,
+                aliases:  '-n',
+                desc:     'The number of the issue which should be marked as ready. If ' \
+                          'no number is specified, it will try to parse it from your ' \
+                          'current branch.'
+
+  def ready
+    symbolized_options = options.each_with_object({}) do |value, memo|
+      memo[value[0].to_sym] = value[1]
+    end
+
+    Commands::Ready.new(io: HustleAndFlow::Io::Shell.new, **symbolized_options).call
+  end
 end
 end
 end

data/lib/hustle_and_flow/commands/ready.rb

@@ -0,0 +1,30 @@
+require 'hustle_and_flow/issue_trackers/commands/ready'
+require 'hustle_and_flow/version_controls/commands/ready'
+
+module  HustleAndFlow
+module  Commands
+class   Ready
+  attr_accessor :io,
+                :options
+
+  def initialize(io:, **args)
+    self.io      = io
+    self.options = args
+  end
+
+  def call
+    repo = VersionControl.new(path: Dir.pwd)
+    VersionControls::Commands::Ready.call \
+      io:              io,
+      repo:            repo
+    IssueTrackers::Commands::Ready.call \
+      io:              io,
+      repo:            repo,
+      me:              repo.user,
+      branch_name:     repo.current_branch.name,
+      overwritten:     [],
+      options:         options
+  end
+end
+end
+end

data/lib/hustle_and_flow/commands/start.rb

@@ -26,9 +26,6 @@ class   Start
                 number:          issue.number,
                 title:           issue.title,
                 branch_template: issue.to_branch_name(version: '*****')
-  rescue Git::GitExecuteError => e
-    io.say 'There was a problem running a git command.'
-    io.say e.message
   end
 end
 end

data/lib/hustle_and_flow/io/shell.rb

@@ -15,6 +15,12 @@ class   Shell < Thor::Shell::Color
     end
   end
 
+  def reopen_issue?(issue)
+    if issue.closed?
+      yes?("This #{issue.class.name} is currenly closed. Would you like to reopen it?")
+    end
+  end
+
   def reassign_issue?(from:)
     yes?("Do you want to reassign this issue from #{from} to yourself?")
   end

data/lib/hustle_and_flow/issue_trackers/commands/ready.rb

@@ -0,0 +1,17 @@
+require 'hustle_and_flow/issue_tracker'
+require 'hustle_and_flow/issue_trackers/github/commands/ready'
+
+module  HustleAndFlow
+module  IssueTrackers
+module  Commands
+class   Ready
+  def self.call(**args)
+    issue_tracker_type = IssueTracker.detect.name.gsub('::Tracker', '')
+    command_class      = const_get("::#{issue_tracker_type}::Commands::Ready")
+
+    command_class.call(**args)
+  end
+end
+end
+end
+end

data/lib/hustle_and_flow/issue_trackers/github/commands/ready.rb

@@ -0,0 +1,78 @@
+require 'hustle_and_flow/issue_trackers/github/tracker'
+require 'hustle_and_flow/issue_trackers/github/pull_requests'
+require 'hustle_and_flow/issue_trackers/github/issues'
+
+module  HustleAndFlow
+module  IssueTrackers
+module  Github
+module  Commands
+class   Ready
+  attr_accessor :branch_name,
+                :me,
+                :pull_requests,
+                :issues,
+                :tracker,
+                :io
+
+  def initialize(**args)
+    self.branch_name   = args[:branch_name]
+    self.me            = args[:me]
+    self.io            = args[:io]
+    self.tracker       = Github::Tracker.new(repo: args[:repo])
+    self.pull_requests = Github::PullRequests.new tracker:  tracker,
+                                                  io:       io
+    self.issues        = Github::Issues.new       tracker: tracker,
+                                                  io:      io
+  end
+
+  def call
+    pull_request = pull_requests.find(branch: branch_name)
+    issue        = issues.filter_by_branch(branch: branch_name).first
+
+    if !issue && !pull_request
+      io.say "Couldn't find either an issue or a pull request for #{branch_name}"
+
+      exit
+    elsif issue && !pull_request
+      pull_request = issue.convert_to_pull_request(branch: branch_name)
+    elsif !issue && pull_request
+      issue = pull_request
+    end
+
+    if pull_request.merged?
+      io.say "This pull request has already been merged and cannot be modified.  " \
+             "If you would like to make any code changes, please begin with " \
+             "'hustle start' and create a new issue."
+
+      exit
+    end
+
+    if io.reopen_issue?(pull_request)
+      pull_request.reopen
+    end
+
+    if pull_request.in_development?
+      pull_request.ready_for_review
+    elsif pull_request.ready_for_review?
+      io.say "Just a note.  It looks like this pull request is already marked as ready " \
+             "for review so I'm not going to touch it."
+    elsif pull_request.being_reviewed?
+      io.say <<-HEREDOC
+Just a note. It looks like the issue is currently being reviewed by <person>.
+Because of this, we're going to stop here and not do any notifications or
+modifications to the Pull Request.
+
+If you'd like to do something else, you can open the PR by pressing 'o',
+otherwise, press any other key to exit.
+      HEREDOC
+    end
+  end
+
+  def self.call(**args)
+    new(**args).call
+  end
+end
+end
+end
+end
+end

data/lib/hustle_and_flow/issue_trackers/github/commands/start.rb

@@ -26,9 +26,9 @@ class   Start
     self.me       = args[:me]
     self.io       = args[:io]
     self.tracker  = Github::Tracker.new(repo: args[:repo])
-    self.issues   = Issues.new(tracker:  tracker,
-                               io:       io,
-                               statuses: statuses)
+    self.issues   = Github::Issues.new(tracker:  tracker,
+                                       io:       io,
+                                       statuses: statuses)
   end
 
   def call

data/lib/hustle_and_flow/issue_trackers/github/issue.rb

@@ -1,5 +1,6 @@
 require 'hustle_and_flow/utils/url_slug'
 require 'hustle_and_flow/errors/unknown_issue_action_error'
+require 'hustle_and_flow/issue_trackers/github/pull_request'
 require 'hustle_and_flow/io/shell'
 
 module  HustleAndFlow
@@ -88,6 +89,12 @@ class   Issue
     result     = true
     conditions = args
 
+    args.delete(:version)
+
+    if title = args.delete(:title)
+      sanitize(title) == sanitize(self.title)
+    end
+
     conditions.each do |key, value|
       result &&= public_send(key) == value
     end
@@ -135,6 +142,31 @@ class   Issue
     branch_name.join('/')
   end
 
+  def convert_to_pull_request(branch: branch)
+    pr_data = client.create_pull_request_for_issue(tracker.repo_name, 'master', branch, number)
+
+    PullRequest.new(tracker: tracker, data: pr_data)
+  end
+
+  def self.from_branch_name(branch_name)
+    branch_name = branch_name.dup
+    branch_data = {}
+
+    version_pattern = /\-v(\d+)\z/
+    number_pattern  = /\-(\d+)\z/
+    action_pattern  = /\-(closes|references|fixes)\z/
+    type_pattern    = %r{\A(\w+)/}
+    title_pattern   = /([\w\-]+)\z/
+
+    branch_data[:version] = branch_name[version_pattern, 1] and branch_name.sub!(version_pattern, '')
+    branch_data[:number]  = branch_name[number_pattern,  1] and branch_name.sub!(number_pattern,  '')
+    branch_data[:action]  = branch_name[action_pattern,  1] and branch_name.sub!(action_pattern,  '')
+    branch_data[:type]    = branch_name[type_pattern,    1] and branch_name.sub!(type_pattern,    '')
+    branch_data[:title]   = branch_name[title_pattern,   1] and branch_name.sub!(title_pattern,   '')
+
+    branch_data
+  end
+
   private
 
   def reopen
@@ -186,6 +218,12 @@ class   Issue
 
     base.join('-').downcase
   end
+
+  def sanitize(other)
+    other.
+    gsub(/[\W\-\s_]/, '').
+    downcase
+  end
 end
 end
 end

data/lib/hustle_and_flow/issue_trackers/github/issues.rb

@@ -36,6 +36,20 @@ class   Issues
                             end)
   end
 
+  def filter_by_branch(branch:)
+    data_from_branch = Issue.
+                       from_branch_name(branch).
+                       each_with_object({}) do |item, memo|
+                         memo[item[0]] = item[1] unless item[1].nil?
+                       end
+
+    self.class.new(io:      io,
+                   tracker: tracker,
+                   issues:  issues.select do |issue|
+                              issue if issue.match?(**data_from_branch)
+                            end)
+  end
+
   private
 
   def find(labels: nil, title: nil, number: nil)

data/lib/hustle_and_flow/issue_trackers/github/pull_request.rb

@@ -0,0 +1,108 @@
+require 'hustle_and_flow/issue_trackers/github/issue'
+
+module  HustleAndFlow
+module  IssueTrackers
+module  Github
+class   PullRequest
+  attr_accessor :tracker,
+                :data,
+                :issue
+
+  def initialize(tracker:, data:)
+    self.tracker = tracker
+    self.data    = data
+    self.issue   = Issue.new(tracker: tracker, data: client.issue(tracker.repo_name, number))
+  end
+
+  def reopen
+    reopened_issue_data = client.update_pull_request(tracker.repo_name, number, state: 'open')
+
+    closed? ? PullRequest.new(tracker: tracker, data: reopened_issue_data) : self
+  end
+
+  def merged?
+    client.pull_request_merged?(tracker.repo_name, number)
+  end
+
+  def in_development?
+    !has_label?(%w{needs-review in-review})
+  end
+
+  def ready_for_review?
+    has_label?(%w{needs-review})
+  end
+
+  def being_reviewed?
+    has_label?(%w{in-review})
+  end
+
+  def ready_for_review
+    reviewed_labels = labels.dup.push('needs-review')
+
+    client.update_issue(tracker.repo_name, number, title, body, labels: reviewed_labels)
+  end
+
+  def closed?
+    status == 'closed'
+  end
+
+  def status
+    data[:state]
+  end
+
+  def body
+    data[:body]
+  end
+
+  def find(me: tracker.me, **filters)
+    client.
+    pull_requests(
+      repo.base_name,
+      pull_request_data,
+    )
+  end
+
+  def self.find(tracker:, **args)
+    new(tracker: tracker).find(**args)
+  end
+
+  def match?(labels: nil, **args)
+    result     = true
+    conditions = args
+
+    conditions.each do |key, value|
+      result &&= public_send(key) == value
+    end
+
+    result &&= labels ? has_label?(labels) : true
+  end
+
+  def title
+    data[:title]
+  end
+
+  def number
+    data[:number]
+  end
+
+  def labels
+    issue.send(:labels)
+  end
+
+  def branch
+    data[:head][:label]
+  end
+
+  def has_label?(other = [])
+    issue.has_label?(other)
+  end
+
+  private
+
+  def client
+    tracker.client
+  end
+end
+end
+end
+end

data/lib/hustle_and_flow/issue_trackers/github/pull_requests.rb

@@ -0,0 +1,77 @@
+require 'hustle_and_flow/issue_trackers/github/pull_request'
+
+module  HustleAndFlow
+module  IssueTrackers
+module  Github
+class   PullRequests
+  include Enumerable
+
+  attr_accessor :tracker,
+                :pull_requests,
+                :io
+
+  def initialize(tracker:, io:, pull_requests: nil)
+    self.io            = io
+    self.tracker       = tracker
+    self.pull_requests = pull_requests
+  end
+
+  # def find_or_create(**args)
+  #   find(**args) || Issue.create(tracker: tracker, io: io, **args)
+  # end
+
+  def each
+    pull_requests.each do |pull_request|
+      yield pull_request
+    end
+  end
+
+  # def filter_by(**args)
+  #   self.class.new(io:      io,
+  #                  tracker: tracker,
+  #                  issues:  issues.select do |issue|
+  #                             issue if issue.match?(**args)
+  #                           end)
+  # end
+  #
+  # private
+
+  def find(labels:            nil,
+           title:             nil,
+           number:            nil,
+           branch:            nil,
+           me:                tracker.me,
+           organization_name: tracker.organization_name)
+
+    pull_requests.find do |pull_request|
+      pull_request.match?(labels: labels, title: title)             ||
+      pull_request.match?(number: number.to_i)                      ||
+      pull_request.match?(branch: "#{me}:#{branch}")                ||
+      pull_request.match?(branch: "#{organization_name}:#{branch}")
+    end
+  end
+
+  def pull_requests
+    @pull_requests ||= client.
+                       pull_requests(tracker.repo_name, query: { state: statuses.first }).
+                       map do |pull_request_data|
+                         PullRequest.new(tracker: tracker,
+                                         data:    pull_request_data)
+                       end
+  end
+
+  def client
+    tracker.client
+  end
+
+  def statuses
+    @statuses ||= [:all]
+  end
+
+  def statuses=(other)
+    @statuses ||= other.nil? ? [:all] : other
+  end
+end
+end
+end
+end

data/lib/hustle_and_flow/issue_trackers/github/tracker.rb

@@ -18,45 +18,13 @@ class   Tracker
     repo.base_name
   end
 
-  # def ready_for_review(branch)
-  #
-  #   No issue number
-  #     Find by title
-  #   Has issue number
-  #     Find by number
-  #
-  #   Issue found
-  #     Issue closed
-  #       Ask to reopen issue
-  #     Issue open
-  #       Issue being reviewed
-  #       Issue not being reviewed
-  #   Issue not found
-  #     Ask to create issue
-  #
-  #   Lookup Pull Request from Issue and Version Number
-  #
-  #   Pull Request Found
-  #     How are PR's found?
-  #
-  #     PR Title Format: #15 v1 - My Issue Title
-  #
-  #     Pull Request Closed
-  #       Reopen PR
-  #     Pull Request Open
-  #       Use found PR
-  #   Pull Request Not Found
-  #     Create New PR
-  #
-  #   pull_request = PullRequest.find_or_create_from_branch_name(branch.name)
-  #   issue        = Issue.find_or_create_from_branch_name(branch.name)
-  #
-  #   issue.ready_for_review(reviewer_names: branch.overwritten_authors)
-  # end
-  #
-  # def update_pull_request(branch)
-  #   client.create_pull_request()
-  # end
+  def organization_name
+    repo.organization
+  end
+
+  def me
+    client.login
+  end
 end
 end
 end

data/lib/hustle_and_flow/version.rb

@@ -1,3 +1,3 @@
 module HustleAndFlow
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/hustle_and_flow/version_controls/commands/ready.rb

@@ -0,0 +1,17 @@
+require 'hustle_and_flow/version_control'
+require 'hustle_and_flow/version_controls/git/commands/ready'
+
+module  HustleAndFlow
+module  VersionControls
+module  Commands
+class   Ready
+  def self.call(**args)
+    version_controls_class = VersionControl.detect.name.gsub('::Repository', '')
+    command_class          = const_get("::#{version_controls_class}::Commands::Ready")
+
+    command_class.call(**args)
+  end
+end
+end
+end
+end

data/lib/hustle_and_flow/version_controls/git/commands/ready.rb

@@ -0,0 +1,30 @@
+module  HustleAndFlow
+module  VersionControls
+module  Git
+module  Commands
+class   Ready
+  attr_accessor :repo,
+                :io
+
+  def initialize(**args)
+    self.repo = args[:repo]
+    self.io   = args[:io]
+  end
+
+  def call
+    system('git update --quiet') &&
+    (
+      system('git ccrtb') ||
+      system('git poc')
+    )                            &&
+    system('bundle exec rspec')
+  end
+
+  def self.call(**args)
+    new(**args).call
+  end
+end
+end
+end
+end
+end

data/lib/hustle_and_flow/version_controls/git/repository.rb

@@ -14,8 +14,12 @@ class   Repository
     repo.config('github.user')
   end
 
+  def organization
+    repo_name_parts[0]
+  end
+
   def base_name
-    origin_url[%r{github\.com.([\w\-]+/[\w\-]+)}, 1]
+    repo_name_parts.join('/')
   end
 
   def upstream_remote_for_branch(branch_name, value = nil)
@@ -47,6 +51,13 @@ class   Repository
                  branches: repo.branches)
   end
 
+  def current_branch
+    current = repo.branch(repo.current_branch)
+
+    Branch.new(repo:   self,
+               branch: current)
+  end
+
   private
 
   def origin_url
@@ -64,6 +75,12 @@ class   Repository
   def upstream_merge_config_key(branch_name)
     "branch.#{branch_name}.merge"
   end
+
+  def repo_name_parts
+    @repo_name_parts ||= origin_url[%r{github\.com.([\w\-]+/[\w\-]+)}, 1].
+                         to_s.
+                         split('/')
+  end
 end
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hustle_and_flow
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - thekompanee
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -166,6 +166,7 @@ files:
 - bin/hustle
 - lib/hustle_and_flow.rb
 - lib/hustle_and_flow/binary/runner.rb
+- lib/hustle_and_flow/commands/ready.rb
 - lib/hustle_and_flow/commands/start.rb
 - lib/hustle_and_flow/errors/unknown_issue_action_error.rb
 - lib/hustle_and_flow/formatters/branch_table_formatter.rb
@@ -173,18 +174,24 @@ files:
 - lib/hustle_and_flow/formatters/issue_table_formatter.rb
 - lib/hustle_and_flow/io/shell.rb
 - lib/hustle_and_flow/issue_tracker.rb
+- lib/hustle_and_flow/issue_trackers/commands/ready.rb
 - lib/hustle_and_flow/issue_trackers/commands/start.rb
+- lib/hustle_and_flow/issue_trackers/github/commands/ready.rb
 - lib/hustle_and_flow/issue_trackers/github/commands/start.rb
 - lib/hustle_and_flow/issue_trackers/github/issue.rb
 - lib/hustle_and_flow/issue_trackers/github/issues.rb
+- lib/hustle_and_flow/issue_trackers/github/pull_request.rb
+- lib/hustle_and_flow/issue_trackers/github/pull_requests.rb
 - lib/hustle_and_flow/issue_trackers/github/tracker.rb
 - lib/hustle_and_flow/utils/string.rb
 - lib/hustle_and_flow/utils/url_slug.rb
 - lib/hustle_and_flow/version.rb
 - lib/hustle_and_flow/version_control.rb
+- lib/hustle_and_flow/version_controls/commands/ready.rb
 - lib/hustle_and_flow/version_controls/commands/start.rb
 - lib/hustle_and_flow/version_controls/git/branch.rb
 - lib/hustle_and_flow/version_controls/git/branches.rb
+- lib/hustle_and_flow/version_controls/git/commands/ready.rb
 - lib/hustle_and_flow/version_controls/git/commands/start.rb
 - lib/hustle_and_flow/version_controls/git/repository.rb
 - spec/lib/hustle_and_flow/formatters/branch_table_formatter_spec.rb