src 0.5.1 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/src.rb +2 -2
  3. data/lib/src/cli.rb +11 -1
  4. data/version +1 -1
  5. metadata +2 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2a0e1ae6298d40e86d5473b5dda72c7e4f43626e
4
- data.tar.gz: c4f012aa6e9e2733488d55df9ee00bd9949bab70
3
+ metadata.gz: 29423ca1cbee406e03835b9127011b1b128feba1
4
+ data.tar.gz: bef5eba010b94efe03f86cd25de6c2e05505911b
5
5
  SHA512:
6
- metadata.gz: ea5ec45f2e8fa6cbce9bb7d4bd207ec7abf904ecf38d2cadbde1ab0e6bd7f2182bf3e95b5ed7197f4f723d1bda49bdbe0697cbd0fa3563bf47431335d94f148d
7
- data.tar.gz: 1b023419b36f6cd7af4df20f5738ae4d4c8e1429b2c8320d338fb8280bfb757e57904bb48e098cf0fd3ac8159ee3e2a63c4e4e780954cb99a539dc454152d2a3
6
+ metadata.gz: 57618ebd506f4c1355fce0ffa1f22fb169a31413da747d1ff18a33e7b63ad50ff5c8a9f1b39ff83cf0ee1e4b334292e9a57247f7f6ea7a20b7875b5e2235ec30
7
+ data.tar.gz: 2c5ed6b9cbfcdb9351118091bde188a56f9de17eeebbbfe1d6e387abdf6342287cb8bf10a817cad1c380352f6de75c0e4458e5420e8ae76c6667a38601964a98
data/lib/src.rb CHANGED
@@ -33,7 +33,7 @@ module SRC
33
33
 
34
34
  branches[(i + 1)..-1].each do |superset|
35
35
  unless branch.subset_of?(superset)
36
- report << "#{branch} should be merged into #{superset}"
36
+ report << "#{branch} is ahead of #{superset}"
37
37
  end
38
38
  end
39
39
 
@@ -57,6 +57,6 @@ module SRC
57
57
  else
58
58
  SRC::Git::Branch.new(k)
59
59
  end
60
- end.compact
60
+ end.compact.uniq { |branch| branch.name }
61
61
  end
62
62
  end
data/lib/src/cli.rb CHANGED
@@ -4,7 +4,13 @@ require 'src/branch'
4
4
  module SRC
5
5
  class CLI
6
6
  def run
7
- public_send(*options[:base_args])
7
+ if options.has_key?(:v)
8
+ version
9
+ elsif options.empty?
10
+ check
11
+ else
12
+ public_send(*options[:base_args])
13
+ end
8
14
  end
9
15
 
10
16
  def cut(*args)
@@ -19,6 +25,10 @@ module SRC
19
25
  SRC.check
20
26
  end
21
27
 
28
+ def version
29
+ puts File.read(File.expand_path('../../version', File.dirname(__FILE__)))
30
+ end
31
+
22
32
  def options
23
33
  @options ||= parse
24
34
  end
data/version CHANGED
@@ -1 +1 @@
1
- 0.5.1
1
+ 0.6.0
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: src
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.1
4
+ version: 0.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tyler Hartland
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-04-25 00:00:00.000000000 Z
11
+ date: 2014-06-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -111,4 +111,3 @@ test_files:
111
111
  - spec/lib/sc/git_spec.rb
112
112
  - spec/lib/sc_spec.rb
113
113
  - spec/spec_helper.rb
114
- has_rdoc: