hustle_and_flow 0.0.2 → 0.0.3

data/lib/hustle_and_flow/version.rb

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

data/lib/hustle_and_flow/version_control.rb

@@ -0,0 +1,19 @@
+require 'hustle_and_flow/version_controls/git/repository'
+
+module  HustleAndFlow
+class   VersionControl
+  attr_accessor :adapter
+
+  def initialize(path:)
+    self.adapter = self.class.detect.new(path: path)
+  end
+
+  def self.detect
+    ::HustleAndFlow::VersionControls::Git::Repository
+  end
+
+  def method_missing(name, *args)
+    adapter.public_send(name, *args)
+  end
+end
+end

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

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

data/lib/hustle_and_flow/{version_control → version_controls}/git/branch.rb

@@ -1,5 +1,5 @@
 module  HustleAndFlow
-module  VersionControl
+module  VersionControls
 module  Git
 class   Branch
   attr_accessor :repo,

data/lib/hustle_and_flow/{version_control → version_controls}/git/branches.rb

@@ -1,8 +1,8 @@
 require 'hustle_and_flow/utils/url_slug'
-require 'hustle_and_flow/version_control/git/branch'
+require 'hustle_and_flow/version_controls/git/branch'
 
 module  HustleAndFlow
-module  VersionControl
+module  VersionControls
 module  Git
 class   Branches
   include Enumerable
@@ -35,6 +35,12 @@ class   Branches
     template.sub('*****', next_version_number.to_s)
   end
 
+  def create_next_branch(template:)
+    branch_name = next_branch_name(template: template)
+
+    repo.find_or_create_branch(branch_name)
+  end
+
   def selectable
     tracking_branches = branches.map do |branch|
       branch.name if branch.has_tracking_branch?

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

@@ -0,0 +1,67 @@
+require 'hustle_and_flow/version_controls/git/branches'
+require 'hustle_and_flow/formatters/branch_table_formatter'
+
+module  HustleAndFlow
+module  VersionControls
+module  Git
+module  Commands
+class   Start
+  attr_accessor :repo,
+                :io,
+                :number,
+                :title,
+                :branch_template
+
+  def initialize(**args)
+    self.repo            = args[:repo]
+    self.io              = args[:io]
+    self.number          = args[:number]
+    self.title           = args[:title]
+    self.branch_template = args[:branch_template]
+  end
+
+  def call
+    available_branches = repo.
+                         branches.
+                         selectable.
+                         filter_by_issue(number: number,
+                                         title:  title)
+
+    next_branch_name = available_branches.next_branch_name(template: branch_template)
+
+    selected = if available_branches.count.zero?
+                 available_branches.create_next_branch(template: branch_template)
+               else
+                 branch_number = nil
+
+                 io.print_formatted_table \
+                   title: 'Possible Existing Branches',
+                   data:  Formatters::BranchTableFormatter.new(available_branches).
+                          to_ary
+
+                 io.print_new_branch_prompt(next_branch_name)
+
+                 until branch_number == 'c' ||
+                       available_branches.valid_number?(branch_number)
+
+                   branch_number = io.choose_branch
+                 end
+
+                 if branch_number == 'c'
+                   available_branches.create_next_branch(template: branch_template)
+                 else
+                   available_branches.from_number(branch_number)
+                 end
+               end
+
+    selected.start
+  end
+
+  def self.call(**args)
+    new(**args).call
+  end
+end
+end
+end
+end
+end

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

@@ -0,0 +1,70 @@
+require 'git'
+
+module  HustleAndFlow
+module  VersionControls
+module  Git
+class   Repository
+  attr_accessor :repo
+
+  def initialize(path:)
+    self.repo = ::Git.open(path)
+  end
+
+  def user
+    repo.config('github.user')
+  end
+
+  def base_name
+    origin_url[%r{github\.com.([\w\-]+/[\w\-]+)}, 1]
+  end
+
+  def upstream_remote_for_branch(branch_name, value = nil)
+    repo.config(upstream_remote_config_key(branch_name), value)
+  end
+
+  def upstream_branch_for_branch(branch_name, value = nil)
+    repo.config(upstream_merge_config_key(branch_name), value)
+  end
+
+  def with_branch(branch_name)
+    repo.checkout(branch_name)
+
+    yield
+
+    repo.push('origin', branch_name)
+  end
+
+  def find_or_create_branch(branch_name)
+    new_branch  = repo.branch(branch_name)
+    new_branch.checkout
+
+    Branch.new(repo:   self,
+               branch: new_branch)
+  end
+
+  def branches
+    Branches.new(repo:     self,
+                 branches: repo.branches)
+  end
+
+  private
+
+  def origin_url
+    origin.url
+  end
+
+  def origin
+    @origin ||= repo.remote('origin')
+  end
+
+  def upstream_remote_config_key(branch_name)
+    "branch.#{branch_name}.remote"
+  end
+
+  def upstream_merge_config_key(branch_name)
+    "branch.#{branch_name}.merge"
+  end
+end
+end
+end
+end

data/spec/lib/hustle_and_flow/issue_trackers/github/issue_spec.rb

@@ -1,14 +1,14 @@
 require 'rspectacular'
 require 'octokit'
-require 'hustle_and_flow/issue_trackers/github'
+require 'hustle_and_flow/issue_trackers/github/tracker'
 require 'hustle_and_flow/issue_trackers/github/issue'
 
 module    HustleAndFlow
 module    IssueTrackers
-class     Github
+module    Github
 describe  Issue, vcr: { record: :all } do
   let(:repo)    { OpenStruct.new(base_name: 'thekompanee/hustle_and_flow') }
-  let(:tracker) { Github.new(repo: repo) }
+  let(:tracker) { Tracker.new(repo: repo) }
 
   it 'can create an issue' do
     issue = Issue.create(tracker: tracker,

data/spec/lib/hustle_and_flow/issue_trackers/github/issues_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
-require 'hustle_and_flow/issue_trackers/github'
+require 'hustle_and_flow/issue_trackers/github/tracker'
 require 'hustle_and_flow/issue_trackers/github/issues'
 
 module    HustleAndFlow
 module    IssueTrackers
-class     Github
+module    Github
 describe  Issues, vcr: { record: :all } do
   let(:repo)    { OpenStruct.new(base_name: 'thekompanee/hustle_and_flow') }
-  let(:tracker) { Github.new(repo: repo) }
+  let(:tracker) { Tracker.new(repo: repo) }
 
   it 'can find an issue based on the type and title' do
     issue = Issues.new(tracker: tracker).

data/spec/lib/hustle_and_flow/issue_trackers/{github_spec.rb → github/tracker_spec.rb}

@@ -1,11 +1,12 @@
 require 'rspectacular'
-require 'hustle_and_flow/issue_trackers/github'
+require 'hustle_and_flow/issue_trackers/github/tracker'
 
 module    HustleAndFlow
 module    IssueTrackers
-describe  Github, :vcr do
+module    Github
+describe  Tracker, :vcr do
   let(:repo)    { OpenStruct.new(base_name: 'thekompanee/hustle_and_flow') }
-  let(:tracker) { Github.new(repo: repo) }
+  let(:tracker) { Tracker.new(repo: repo) }
 
   it 'can find a list of issues' do
     issues = tracker.find_issues_by(status: 'open')
@@ -42,10 +43,11 @@ describe  Github, :vcr do
     issue = tracker.find_or_create_issue type:  'feature',
                                          title: 'Ninjitsu'
 
-    assigned_issue = Github.assign_issue(issue, to: 'jfelchner')
+    assigned_issue = Tracker.assign_issue(issue, to: 'jfelchner')
 
     expect(assigned_issue).to be_assigned_to 'jfelchner'
   end
 end
 end
 end
+end

data/spec/lib/hustle_and_flow/vcs_repository_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
-require 'hustle_and_flow/vcs_repository'
+require 'hustle_and_flow/version_control'
 
 module    HustleAndFlow
-describe  VcsRepository do
+describe  VersionControl do
   it 'can determine the base name of the repo' do
     with_repo do |git|
       git.source.add_remote('origin', 'https://github.com/thekompanee/hustle_and_flow.git')
-      repo = VcsRepository.new(path: git.source.dir.to_s)
+      repo = VersionControl.new(path: git.source.dir.to_s)
 
       expect(repo.base_name).to eql 'thekompanee/hustle_and_flow'
     end

data/spec/lib/hustle_and_flow/{version_control → version_controls}/git/branch_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
-require 'hustle_and_flow/version_control/git/branch'
+require 'hustle_and_flow/version_controls/git/branch'
 
 module    HustleAndFlow
-module    VersionControl
+module    VersionControls
 module    Git
 describe  Branch do
   it 'knows if it is the current branch' do

data/spec/lib/hustle_and_flow/{version_control → version_controls}/git/branches_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
-require 'hustle_and_flow/version_control/git/branches'
+require 'hustle_and_flow/version_controls/git/branches'
 require 'hustle_and_flow/issue_trackers/github/issue'
 
 module    HustleAndFlow
-module    VersionControl
+module    VersionControls
 module    Git
 describe  Branches do
   it 'can filter a list of branches by an issue number' do

data/spec/lib/hustle_and_flow/{version_control → version_controls}/git/repository_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
-require 'hustle_and_flow/version_control/git/repository'
+require 'hustle_and_flow/version_controls/git/repository'
 
 module    HustleAndFlow
-module    VersionControl
+module    VersionControls
 module    Git
 describe  Repository do
   # it 'can determine the base name of the repo' do

data/spec/support/git_repo.rb

@@ -1,5 +1,5 @@
 require 'fileutils'
-require 'hustle_and_flow/version_control/git/repository'
+require 'hustle_and_flow/version_controls/git/repository'
 
 def with_repo
   name                = 'my-repo'
@@ -12,7 +12,7 @@ def with_repo
     my_repo.add(all: true)
     my_repo.commit_all('Initial commit')
 
-    repo = HustleAndFlow::VersionControl::Git::Repository.new(path: Dir.pwd)
+    repo = HustleAndFlow::VersionControls::Git::Repository.new(path: Dir.pwd)
 
     yield repo if block_given?
   end
@@ -31,13 +31,13 @@ def with_remote_repo
     my_repo.commit_all('Initial commit')
   end
 
-  remote_repo = HustleAndFlow::VersionControl::Git::Repository.new(path: remote_directory)
+  remote_repo = HustleAndFlow::VersionControls::Git::Repository.new(path: remote_directory)
 
   Dir.chdir local_directory do
     Git.clone(remote_directory, name)
   end
 
-  local_repo = HustleAndFlow::VersionControl::Git::Repository.new(path: "#{local_directory}/#{name}")
+  local_repo = HustleAndFlow::VersionControls::Git::Repository.new(path: "#{local_directory}/#{name}")
 
   yield [local_repo, remote_repo] if block_given?
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hustle_and_flow
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - thekompanee
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -173,16 +173,20 @@ 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/github.rb
+- lib/hustle_and_flow/issue_trackers/commands/start.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/tracker.rb
 - lib/hustle_and_flow/utils/string.rb
 - lib/hustle_and_flow/utils/url_slug.rb
-- lib/hustle_and_flow/vcs_repository.rb
 - lib/hustle_and_flow/version.rb
-- lib/hustle_and_flow/version_control/git/branch.rb
-- lib/hustle_and_flow/version_control/git/branches.rb
-- lib/hustle_and_flow/version_control/git/repository.rb
+- lib/hustle_and_flow/version_control.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/start.rb
+- lib/hustle_and_flow/version_controls/git/repository.rb
 - spec/lib/hustle_and_flow/formatters/branch_table_formatter_spec.rb
 - spec/lib/hustle_and_flow/formatters/issue_detail_formatter_spec.rb
 - spec/lib/hustle_and_flow/formatters/issue_table_formatter_spec.rb
@@ -190,11 +194,11 @@ files:
 - spec/lib/hustle_and_flow/issue_tracker_spec.rb
 - spec/lib/hustle_and_flow/issue_trackers/github/issue_spec.rb
 - spec/lib/hustle_and_flow/issue_trackers/github/issues_spec.rb
-- spec/lib/hustle_and_flow/issue_trackers/github_spec.rb
+- spec/lib/hustle_and_flow/issue_trackers/github/tracker_spec.rb
 - spec/lib/hustle_and_flow/vcs_repository_spec.rb
-- spec/lib/hustle_and_flow/version_control/git/branch_spec.rb
-- spec/lib/hustle_and_flow/version_control/git/branches_spec.rb
-- spec/lib/hustle_and_flow/version_control/git/repository_spec.rb
+- spec/lib/hustle_and_flow/version_controls/git/branch_spec.rb
+- spec/lib/hustle_and_flow/version_controls/git/branches_spec.rb
+- spec/lib/hustle_and_flow/version_controls/git/repository_spec.rb
 - spec/lib/utils/url_slug_spec.rb
 - spec/spec_helper.rb
 - spec/support/git_repo.rb
@@ -220,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Development Workflow Commands
@@ -232,11 +236,11 @@ test_files:
 - spec/lib/hustle_and_flow/issue_tracker_spec.rb
 - spec/lib/hustle_and_flow/issue_trackers/github/issue_spec.rb
 - spec/lib/hustle_and_flow/issue_trackers/github/issues_spec.rb
-- spec/lib/hustle_and_flow/issue_trackers/github_spec.rb
+- spec/lib/hustle_and_flow/issue_trackers/github/tracker_spec.rb
 - spec/lib/hustle_and_flow/vcs_repository_spec.rb
-- spec/lib/hustle_and_flow/version_control/git/branch_spec.rb
-- spec/lib/hustle_and_flow/version_control/git/branches_spec.rb
-- spec/lib/hustle_and_flow/version_control/git/repository_spec.rb
+- spec/lib/hustle_and_flow/version_controls/git/branch_spec.rb
+- spec/lib/hustle_and_flow/version_controls/git/branches_spec.rb
+- spec/lib/hustle_and_flow/version_controls/git/repository_spec.rb
 - spec/lib/utils/url_slug_spec.rb
 - spec/spec_helper.rb
 - spec/support/git_repo.rb

data/lib/hustle_and_flow/issue_trackers/github.rb

@@ -1,71 +0,0 @@
-require 'octokit'
-require 'hustle_and_flow/issue_trackers/github/issue'
-require 'hustle_and_flow/issue_trackers/github/issues'
-
-module  HustleAndFlow
-module  IssueTrackers
-class   Github
-  attr_accessor :client,
-                :repo,
-                :source
-
-  def initialize(repo:)
-    Octokit.auto_paginate = true
-
-    self.client = Octokit::Client.new(netrc: true)
-    self.repo   = repo
-  end
-
-  def repo_name
-    repo.base_name
-  end
-
-  def start(io:, me:, issue_data:)
-    Issues.start(tracker:    self,
-                 io:         io,
-                 me:         me,
-                 issue_data: issue_data)
-  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
-end
-end
-end

data/lib/hustle_and_flow/vcs_repository.rb

@@ -1,19 +0,0 @@
-require 'hustle_and_flow/version_control/git/repository'
-
-module  HustleAndFlow
-class   VcsRepository
-  attr_accessor :adapter
-
-  def initialize(**args)
-    self.adapter = HustleAndFlow::
-                   VersionControl::
-                   Git::
-                   Repository.
-                   new(path: args[:path])
-  end
-
-  def method_missing(name, *args)
-    adapter.public_send(name, *args)
-  end
-end
-end

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

@@ -1,99 +0,0 @@
-require 'git'
-require 'hustle_and_flow/version_control/git/branches'
-require 'hustle_and_flow/formatters/branch_table_formatter'
-
-module  HustleAndFlow
-module  VersionControl
-module  Git
-class   Repository
-  attr_accessor :repo
-
-  def initialize(path:)
-    self.repo = ::Git.open(path)
-  end
-
-  def start(io:, number:, title:, branch_template:)
-    available_branches = branches.
-                         selectable.
-                         filter_by_issue(number: number,
-                                         title:  title)
-
-    next_branch_name = available_branches.next_branch_name(template: branch_template)
-
-    selected = if available_branches.count.zero?
-                 Branch.new(repo: self, branch: repo.checkout(next_branch_name,
-                                                              new_branch: true))
-               else
-                 branch_number = nil
-
-                 io.print_formatted_table \
-                   title: 'Possible Existing Branches',
-                   data:  Formatters::BranchTableFormatter.new(available_branches).
-                         to_ary
-
-                 io.print_new_branch_prompt(next_branch_name)
-
-                 until available_branches.valid_number? branch_number
-                   branch_number = io.choose_branch
-                 end
-
-                 available_branches.from_number(branch_number)
-               end
-
-    selected.start
-  end
-
-  def user
-    repo.config('github.user')
-  end
-
-  def base_name
-    origin_url[%r{github\.com.([\w\-]+/[\w\-]+)}, 1]
-  end
-
-  def upstream_remote_for_branch(branch_name, value = nil)
-    repo.config(upstream_remote_config_key(branch_name), value)
-  end
-
-  def upstream_branch_for_branch(branch_name, value = nil)
-    repo.config(upstream_merge_config_key(branch_name), value)
-  end
-
-  def with_branch(branch_name)
-    repo.checkout(branch_name)
-
-    yield
-
-    repo.push('origin', branch_name)
-  end
-
-  private
-
-  def branches
-    Branches.new(repo:     self,
-                 branches: repo.branches)
-  end
-
-  def new_branch_name(branch_template)
-    branch_template.sub('*****', branches.next_version_number)
-  end
-
-  def origin_url
-    origin.url
-  end
-
-  def origin
-    @origin ||= repo.remote('origin')
-  end
-
-  def upstream_remote_config_key(branch_name)
-    "branch.#{branch_name}.remote"
-  end
-
-  def upstream_merge_config_key(branch_name)
-    "branch.#{branch_name}.merge"
-  end
-end
-end
-end
-end