straight_line 0.1.0.0 → 0.1.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (30) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +1 -0
  3. data/VERSION +1 -1
  4. data/lib/{cli → straight_line/cli}/application.rb +0 -0
  5. data/lib/{cli → straight_line/cli}/feature.rb +0 -0
  6. data/lib/{common → straight_line/common}/command.rb +2 -2
  7. data/lib/{common → straight_line/common}/feature/create.rb +2 -2
  8. data/lib/{common → straight_line/common}/feature/diff.rb +10 -10
  9. data/lib/{common → straight_line/common}/feature/land.rb +7 -7
  10. data/lib/{common → straight_line/common}/feature.rb +1 -1
  11. data/lib/{common → straight_line/common}/git_commands/commit.rb +1 -1
  12. data/lib/{common → straight_line/common}/git_commands/config.rb +1 -1
  13. data/lib/{common → straight_line/common}/git_commands/log.rb +2 -2
  14. data/lib/{common → straight_line/common}/git_commands/merge.rb +2 -2
  15. data/lib/{common → straight_line/common}/git_commands/pull.rb +1 -1
  16. data/lib/{common → straight_line/common}/git_commands/push.rb +1 -1
  17. data/lib/{common → straight_line/common}/git_commands/rebase.rb +3 -3
  18. data/lib/{common → straight_line/common}/git_commands.rb +2 -2
  19. data/lib/{common → straight_line/common}/github.rb +3 -3
  20. data/lib/{common → straight_line/common}/shell_error.rb +0 -0
  21. data/lib/{common → straight_line/common}/user_error.rb +0 -0
  22. data/lib/{common → straight_line/common}/util.rb +0 -0
  23. data/lib/{tasks → straight_line/tasks}/feature/create.rb +2 -2
  24. data/lib/{tasks → straight_line/tasks}/feature/diff.rb +2 -2
  25. data/lib/{tasks → straight_line/tasks}/feature/land.rb +2 -2
  26. data/lib/straight_line/tasks.rb +3 -0
  27. data/lib/straight_line.rb +3 -0
  28. data/straight_line.gemspec +0 -1
  29. metadata +25 -25
  30. data/lib/tasks.rb +0 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: cd3ea639e178d3b6ba385dfd98073e7db4f2d015
4
- data.tar.gz: 4b13db7bf8ca43cce49b9f53c5899cf727a2f562
3
+ metadata.gz: 771987714afd7987ff53d38e65f7b02005c60f9f
4
+ data.tar.gz: 73a315adf6ef9e36123f910055fe8570b2ad712c
5
5
  SHA512:
6
- metadata.gz: 24a85ef8f1e32ff7e9087ec1a64c79bcafe9ba7bce5f471d8d992184bc16b6b8fe84499a1ff7f6526be72fdb8ad503e504646ccd2389687a1459f5ebed1e27cf
7
- data.tar.gz: 4ad03255fc52133447017b7e0234e26a763014bade78ae4fdf4b678ccbf4334a535ec824bd1e50260c5f59f877a83c328c9ef6e94c975eba7c446684c2d2618a
6
+ metadata.gz: 9dcbe95744cb5d7d18605d4b52b17dd168c6f0e2d929a1e82314257db14b055554749034e0a35f6e906b022b489840aea388f75d2b930742268fd6cd4a6ffb6d
7
+ data.tar.gz: 9268dd80b853369d362889cbb5689ed7281dd154af6040d74e56a66ebb176e594c7e8406a1dd1af0498ea579734f979d4319f229dbf686d87bf044779305af99
data/Rakefile CHANGED
@@ -1,5 +1,6 @@
1
1
  require 'bundler/gem_tasks'
2
2
  require 'rspec/core/rake_task'
3
+ require 'version_bumper'
3
4
 
4
5
  RSpec::Core::RakeTask.new(:spec)
5
6
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.0.0
1
+ 0.1.1.0
File without changes
File without changes
@@ -1,5 +1,5 @@
1
1
  require 'open3'
2
- require 'common/shell_error'
2
+ require 'straight_line/common/shell_error'
3
3
  # Basic class for wrapping shell execution
4
4
  class Command
5
5
  attr_accessor :working_dir
@@ -42,7 +42,7 @@ class Command
42
42
 
43
43
  def sub_command(command)
44
44
  unless command.is_a? Command
45
- raise ArgumentError, 'command must be of type common/command'
45
+ raise ArgumentError, 'command must be of type straight_line/common/command'
46
46
  end
47
47
  @sub_commands << command
48
48
  end
@@ -1,5 +1,5 @@
1
- require 'common/user_error'
2
- require 'common/command'
1
+ require 'straight_line/common/user_error'
2
+ require 'straight_line/common/command'
3
3
 
4
4
  module Feature
5
5
  # Creates a new branch for the feature
@@ -1,13 +1,13 @@
1
- require 'common/command'
2
- require 'common/feature'
3
- require 'common/git_commands/pull'
4
- require 'common/git_commands/rebase'
5
- require 'common/git_commands/merge'
6
- require 'common/git_commands/push'
7
- require 'common/git_commands/commit'
8
- require 'common/git_commands/log'
9
- require 'common/user_error'
10
- require 'common/github'
1
+ require 'straight_line/common/command'
2
+ require 'straight_line/common/feature'
3
+ require 'straight_line/common/git_commands/pull'
4
+ require 'straight_line/common/git_commands/rebase'
5
+ require 'straight_line/common/git_commands/merge'
6
+ require 'straight_line/common/git_commands/push'
7
+ require 'straight_line/common/git_commands/commit'
8
+ require 'straight_line/common/git_commands/log'
9
+ require 'straight_line/common/user_error'
10
+ require 'straight_line/common/github'
11
11
  require 'octokit'
12
12
 
13
13
  module Feature
@@ -1,10 +1,10 @@
1
- require 'common/feature'
2
- require 'common/git_commands/merge'
3
- require 'common/git_commands/commit'
4
- require 'common/git_commands/pull'
5
- require 'common/git_commands/push'
6
- require 'common/util'
7
- require 'common/github'
1
+ require 'straight_line/common/feature'
2
+ require 'straight_line/common/git_commands/merge'
3
+ require 'straight_line/common/git_commands/commit'
4
+ require 'straight_line/common/git_commands/pull'
5
+ require 'straight_line/common/git_commands/push'
6
+ require 'straight_line/common/util'
7
+ require 'straight_line/common/github'
8
8
 
9
9
  module Feature
10
10
  # Merges the feature to master and pushes it
@@ -1,4 +1,4 @@
1
- require 'common/command'
1
+ require 'straight_line/common/command'
2
2
  # Base module for all features
3
3
  module Feature
4
4
  def current_feature
@@ -1,4 +1,4 @@
1
- require 'common/command'
1
+ require 'straight_line/common/command'
2
2
 
3
3
  module GitCommands
4
4
  # Commit
@@ -1,4 +1,4 @@
1
- require 'common/command'
1
+ require 'straight_line/common/command'
2
2
 
3
3
  module GitCommands
4
4
  # Read a config setting
@@ -1,4 +1,4 @@
1
- require 'common/command'
1
+ require 'straight_line/common/command'
2
2
 
3
3
  module GitCommands
4
4
  # return git log information
@@ -9,4 +9,4 @@ module GitCommands
9
9
  arg opts
10
10
  end
11
11
  end
12
- end
12
+ end
@@ -1,5 +1,5 @@
1
- require 'common/command'
2
- require 'common/git_commands'
1
+ require 'straight_line/common/command'
2
+ require 'straight_line/common/git_commands'
3
3
 
4
4
  module GitCommands
5
5
  # Merge a branch into base
@@ -1,4 +1,4 @@
1
- require 'common/command'
1
+ require 'straight_line/common/command'
2
2
 
3
3
  module GitCommands
4
4
  # pull a branch from remote
@@ -1,4 +1,4 @@
1
- require 'common/command'
1
+ require 'straight_line/common/command'
2
2
 
3
3
  module GitCommands
4
4
  # Push a branch to remote
@@ -1,6 +1,6 @@
1
- require 'common/command'
2
- require 'common/shell_error'
3
- require 'common/git_commands'
1
+ require 'straight_line/common/command'
2
+ require 'straight_line/common/shell_error'
3
+ require 'straight_line/common/git_commands'
4
4
 
5
5
  module GitCommands
6
6
  # Rebase a branch to a base
@@ -1,4 +1,4 @@
1
- require 'common/util'
1
+ require 'straight_line/common/util'
2
2
  module GitCommands
3
3
  def handle_merge_conflict(e)
4
4
  if e.message.match %r[Merge conflict in]
@@ -7,4 +7,4 @@ module GitCommands
7
7
  end
8
8
  raise e
9
9
  end
10
- end
10
+ end
@@ -1,7 +1,7 @@
1
1
  require 'singleton'
2
2
  require 'octokit'
3
- require 'common/user_error'
4
- require 'common/git_commands/config'
3
+ require 'straight_line/common/user_error'
4
+ require 'straight_line/common/git_commands/config'
5
5
 
6
6
  # Github API wrapper
7
7
  class Github
@@ -51,7 +51,7 @@ class Github
51
51
  def repo_name
52
52
  cmd = GitCommands::Config.new('remote.origin.url')
53
53
  remote = cmd.run
54
- remote.match(%r{(git@github.com:)(.*/.*)})[2]
54
+ remote.match(%r{(git@github.com:)(.*/.*)\.git})[2]
55
55
  end
56
56
 
57
57
  def github_login
File without changes
File without changes
File without changes
@@ -1,6 +1,6 @@
1
1
  require 'rake'
2
- require 'common/command'
3
- require 'common/feature/create'
2
+ require 'straight_line/common/command'
3
+ require 'straight_line/common/feature/create'
4
4
 
5
5
  namespace 'feature' do
6
6
  desc 'Creates a feature branch'
@@ -1,6 +1,6 @@
1
1
  require 'rake'
2
- require 'common/command'
3
- require 'common/feature/diff'
2
+ require 'straight_line/common/command'
3
+ require 'straight_line/common/feature/diff'
4
4
 
5
5
  namespace 'feature' do
6
6
  desc 'Manages a pull request for the current feature branch'
@@ -1,6 +1,6 @@
1
1
  require 'rake'
2
- require 'common/command'
3
- require 'common/feature/land'
2
+ require 'straight_line/common/command'
3
+ require 'straight_line/common/feature/land'
4
4
 
5
5
  namespace 'feature' do
6
6
  desc 'Merges master into the feature branch then merges
@@ -0,0 +1,3 @@
1
+ require 'straight_line/tasks/feature/create'
2
+ require 'straight_line/tasks/feature/diff'
3
+ require 'straight_line/tasks/feature/land'
data/lib/straight_line.rb CHANGED
@@ -2,4 +2,7 @@
2
2
  # Base module definition
3
3
  module StraightLine
4
4
  # Your code goes here...
5
+ def self.foo
6
+ puts 'la'
7
+ end
5
8
  end
@@ -1,7 +1,6 @@
1
1
  # coding: utf-8
2
2
  lib = File.expand_path('../lib', __FILE__)
3
3
  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
- require 'common/command'
5
4
 
6
5
  Gem::Specification.new do |spec|
7
6
  spec.name = 'straight_line'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: straight_line
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0.0
4
+ version: 0.1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Usick
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-02-22 00:00:00.000000000 Z
11
+ date: 2017-03-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -118,30 +118,30 @@ files:
118
118
  - bin/console
119
119
  - bin/setup
120
120
  - exe/sgw
121
- - lib/cli/application.rb
122
- - lib/cli/feature.rb
123
- - lib/common/command.rb
124
- - lib/common/feature.rb
125
- - lib/common/feature/create.rb
126
- - lib/common/feature/diff.rb
127
- - lib/common/feature/land.rb
128
- - lib/common/git_commands.rb
129
- - lib/common/git_commands/commit.rb
130
- - lib/common/git_commands/config.rb
131
- - lib/common/git_commands/log.rb
132
- - lib/common/git_commands/merge.rb
133
- - lib/common/git_commands/pull.rb
134
- - lib/common/git_commands/push.rb
135
- - lib/common/git_commands/rebase.rb
136
- - lib/common/github.rb
137
- - lib/common/shell_error.rb
138
- - lib/common/user_error.rb
139
- - lib/common/util.rb
140
121
  - lib/straight_line.rb
141
- - lib/tasks.rb
142
- - lib/tasks/feature/create.rb
143
- - lib/tasks/feature/diff.rb
144
- - lib/tasks/feature/land.rb
122
+ - lib/straight_line/cli/application.rb
123
+ - lib/straight_line/cli/feature.rb
124
+ - lib/straight_line/common/command.rb
125
+ - lib/straight_line/common/feature.rb
126
+ - lib/straight_line/common/feature/create.rb
127
+ - lib/straight_line/common/feature/diff.rb
128
+ - lib/straight_line/common/feature/land.rb
129
+ - lib/straight_line/common/git_commands.rb
130
+ - lib/straight_line/common/git_commands/commit.rb
131
+ - lib/straight_line/common/git_commands/config.rb
132
+ - lib/straight_line/common/git_commands/log.rb
133
+ - lib/straight_line/common/git_commands/merge.rb
134
+ - lib/straight_line/common/git_commands/pull.rb
135
+ - lib/straight_line/common/git_commands/push.rb
136
+ - lib/straight_line/common/git_commands/rebase.rb
137
+ - lib/straight_line/common/github.rb
138
+ - lib/straight_line/common/shell_error.rb
139
+ - lib/straight_line/common/user_error.rb
140
+ - lib/straight_line/common/util.rb
141
+ - lib/straight_line/tasks.rb
142
+ - lib/straight_line/tasks/feature/create.rb
143
+ - lib/straight_line/tasks/feature/diff.rb
144
+ - lib/straight_line/tasks/feature/land.rb
145
145
  - straight_line.gemspec
146
146
  homepage: https://github.com/chrisUsick/straight_line
147
147
  licenses:
data/lib/tasks.rb DELETED
@@ -1,3 +0,0 @@
1
- require 'tasks/feature/create'
2
- require 'tasks/feature/diff'
3
- require 'tasks/feature/land'