owners 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ee93e4fe5cb329bf5df70608c572efa974963c4
-  data.tar.gz: 578b7e1c7ece642fa707b8499756c1424e2e77b0
+  metadata.gz: 3b247236f150660b0597f6585ef18b9baaaf6d65
+  data.tar.gz: 1f4dec428c925c16a02e647748d34a60f99addb2
 SHA512:
-  metadata.gz: 6f2c6ee735c8135a86454cf69e08888e18f102dfdc75546c64afcbc00caba068edf90d8e3a5c284378314b60bc0762c68d12ef9a7bf00deea1be24992954c780
-  data.tar.gz: 6038c4e460cb1aa68ee140e6e464890fae548ea1e0c177ce9cda055826012da6fc002bf797d7a56385cdb65c9ae75be447d3c19da37c74f28e9faf06493ccd3a
+  metadata.gz: 28bf4ed8f9ad70007507faad897fd0e8a7af4e81d3a921ec1a039803521e449e5420a3e7d816018799b4867240312ab6e55b6906fb3a97c18352aa3cea838451
+  data.tar.gz: 3166205427b49ed54e99e302ac54f7707b189e25408f1750e4f8c83f7f3810a7740e35309e0f2f52310c23c3ef3511eff6bc55ebeb4353c177807085685355a4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    owners (0.1.0)
+    owners (0.1.1)
       thor
 
 GEM

data/README.md

@@ -84,7 +84,7 @@ This returns an array of `Owner` objects which are simple wrappers around
 owners = Owners.for("db/schema.rb", ".env") #=> ["@data", "#internal"]
 ```
 
-The owner's `type` can be one of `%i(alert email group label mention path tag)`.
+The owner's `type` can be one of `%i(alert email group label mention tag)`.
 
 ```ruby
 owners.first.type #=> :mention

data/lib/owners/cli.rb

@@ -14,12 +14,7 @@ module Owners
 
     desc "for [FILES...]", "List owners for a set of files"
     def for(*files)
-      files = stdin_files unless files.any?
-
-      Owners.file = options[:file] if options[:file]
-      Owners.for(*files).each do |owner|
-        output(owner)
-      end
+      run(:for, files)
     end
 
     desc "for_diff REF [BASE_REF]", "List owners for a set of git changes"
@@ -32,12 +27,7 @@ module Owners
 
     desc "missing_for [FILES...]", "List files that don't have owners"
     def missing_for(*files)
-      files = stdin_files unless files.any?
-
-      Owners.file = options[:file] if options[:file]
-      Owners.missing_for(*files).each do |owner|
-        output(owner)
-      end
+      run(:missing_for, files)
     end
 
     no_commands do
@@ -45,16 +35,31 @@ module Owners
         say owner
 
         if options[:debug]
-          say owner.type, :yellow
+          last_sub = nil
 
           owner.subscriptions.each do |path, subscriptions|
             subscriptions.each do |sub|
-              say "  #{path}", :red
-              say "  #{sub.file}:#{sub.line} => #{sub.filter}", :blue
-            end
+              if last_sub != sub
+                say if last_sub
+                say "  #{sub}", :blue
+              end
 
-            say
+              say "    #{path}", :red unless path == sub.source
+              last_sub = sub
+            end
           end
+
+          say
+        end
+      end
+
+      def run(method, files)
+        files = stdin_files unless files.any?
+
+        Owners.file = options[:file] if options[:file]
+
+        Owners.send(method, *files).each do |owner|
+          output(owner)
         end
       end
 

data/lib/owners/owner.rb

@@ -26,8 +26,6 @@ module Owners
         :mention
       when /^#/
         :tag
-      when /\//
-        :path
       else
         :label
       end

data/lib/owners/subscription.rb

@@ -7,6 +7,8 @@ module Owners
   #
   # @api public
   class Subscription
+    include Comparable
+
     COMMENT = /^\s*\/\//
     WILDCARD = /.*/
 
@@ -20,14 +22,26 @@ module Owners
       @root = config.root
     end
 
+    def <=>(other)
+      location <=> other.location
+    end
+
     def filter
       Regexp.new(@filter || WILDCARD)
     end
 
+    def location
+      [file, line].join(":")
+    end
+
     def metadata?
       comment? || empty?
     end
 
+    def source
+      filter.source
+    end
+
     def subscribed?(path)
       path =~ prefix && relative(path) =~ filter
     end
@@ -36,6 +50,10 @@ module Owners
       @subscribers.split(",").reject(&:empty?)
     end
 
+    def to_s
+      [source, location].join(" ")
+    end
+
     private
 
     def comment?

data/lib/owners/version.rb

@@ -1,3 +1,3 @@
 module Owners
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/owner_spec.rb

@@ -60,7 +60,7 @@ RSpec.describe Owners::Owner do
       let(:owner) { "/one/two" }
 
       it "parses type correctly" do
-        expect(subject).to eq(:path)
+        expect(subject).to eq(:label)
       end
     end
 

data/spec/owners_cli_spec.rb

@@ -42,14 +42,12 @@ RSpec.describe Owners::CLI do
       it "parses owners correctly" do
         expected = <<-OUTPUT
 @org/auth
-group
-  example/app/controllers/users_controller.rb
-  example/app/OWNERS:1 => (?-mix:user)
+  user example/app/OWNERS:1
+    example/app/controllers/users_controller.rb
 
 @org/blog
-group
-  example/app/controllers/users_controller.rb
-  example/OWNERS:2 => (?-mix:.*)
+  .* example/OWNERS:2
+    example/app/controllers/users_controller.rb
 
         OUTPUT
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: owners
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sean Huber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec