src 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a0e1ae6298d40e86d5473b5dda72c7e4f43626e
-  data.tar.gz: c4f012aa6e9e2733488d55df9ee00bd9949bab70
+  metadata.gz: 29423ca1cbee406e03835b9127011b1b128feba1
+  data.tar.gz: bef5eba010b94efe03f86cd25de6c2e05505911b
 SHA512:
-  metadata.gz: ea5ec45f2e8fa6cbce9bb7d4bd207ec7abf904ecf38d2cadbde1ab0e6bd7f2182bf3e95b5ed7197f4f723d1bda49bdbe0697cbd0fa3563bf47431335d94f148d
-  data.tar.gz: 1b023419b36f6cd7af4df20f5738ae4d4c8e1429b2c8320d338fb8280bfb757e57904bb48e098cf0fd3ac8159ee3e2a63c4e4e780954cb99a539dc454152d2a3
+  metadata.gz: 57618ebd506f4c1355fce0ffa1f22fb169a31413da747d1ff18a33e7b63ad50ff5c8a9f1b39ff83cf0ee1e4b334292e9a57247f7f6ea7a20b7875b5e2235ec30
+  data.tar.gz: 2c5ed6b9cbfcdb9351118091bde188a56f9de17eeebbbfe1d6e387abdf6342287cb8bf10a817cad1c380352f6de75c0e4458e5420e8ae76c6667a38601964a98

data/lib/src.rb

@@ -33,7 +33,7 @@ module SRC
 
       branches[(i + 1)..-1].each do |superset|
         unless branch.subset_of?(superset)
-          report << "#{branch} should be merged into #{superset}"
+          report << "#{branch} is ahead of #{superset}"
         end
       end
 
@@ -57,6 +57,6 @@ module SRC
       else
         SRC::Git::Branch.new(k)
       end
-    end.compact
+    end.compact.uniq { |branch| branch.name }
   end
 end

data/lib/src/cli.rb

@@ -4,7 +4,13 @@ require 'src/branch'
 module SRC
   class CLI
     def run
-      public_send(*options[:base_args])
+      if options.has_key?(:v)
+        version
+      elsif options.empty?
+        check
+      else
+        public_send(*options[:base_args])
+      end
     end
 
     def cut(*args)
@@ -19,6 +25,10 @@ module SRC
       SRC.check
     end
 
+    def version
+      puts File.read(File.expand_path('../../version', File.dirname(__FILE__)))
+    end
+
     def options
       @options ||= parse
     end

data/version

@@ -1 +1 @@
-0.5.1
+0.6.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: src
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Tyler Hartland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,4 +111,3 @@ test_files:
 - spec/lib/sc/git_spec.rb
 - spec/lib/sc_spec.rb
 - spec/spec_helper.rb
-has_rdoc: