piggly 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c6bf40f9aa03c6a2ebf7dc77185b8d0fb17cb1b
-  data.tar.gz: 72e0c24978ea9924e1a1c83a4022fa3556a492ad
+  metadata.gz: 0aca5c86391dab9ddd1b0529e469c67f440ce9c8
+  data.tar.gz: aa7ced6807ad226312f95fb428d6e1ea36aa6af4
 SHA512:
-  metadata.gz: 3bfa8e89afcd5a97f4e5dca7f16b610ac47aa900b2053c2a3cd436131f3d0c49caf24c16f9ac9bb60d80c994fe6f80d536d80f710fd42c1d14b4fe08290aac4d
-  data.tar.gz: 924a46543d48d96cd15b4fdb0c02ff5bd24097d2a48e8ba0a099ac71c7241449f3e88649938ba9c571e9e47a1d3e1d9c24faf1a8580cacdb647541464b471279
+  metadata.gz: 9a77dc4124175df8e45f1223e0b46c3dee9bb2f8282f0552b61dcccf4dc5348da072a5c5672bb77656c05f1b4e29fc9d0e47392d7d90fcad3396539f5c782e3e
+  data.tar.gz: 438b3ceb842971d0233eb16e9f41513b4494e50457e0bd8879f3aaa0858feeb4bf1ee11e17430b3b537f5c503e4a362deffa48b5a3739c24d38ca0f02536e7d2

data/lib/piggly/command/base.rb

@@ -16,8 +16,6 @@ module Piggly
         end
       end
 
-    private
-
       # @return [(Class, Array<String>)]
       def command(argv)
         return if argv.empty?
@@ -67,26 +65,16 @@ module Piggly
         else
           head, _ = config.filters
 
-          start = index.procedures
+          start =
+            case head.first
+            when :+; []
+            when :-; index.procedures
+            end
 
           config.filters.inject(start) do |s, pair|
             case pair.first
-              when :+
-                puts "Selecting procedures"
-                o = s.select(&pair.last)
-                puts "Selected #{ o.count} procedures"
-                puts "Selected:"
-                o.each do |x| puts x.name end
-		puts "---"
-                o
-              when :-
-                puts "Rejecting procedures"
-                o = s.reject(&pair.last)
-                puts "Rejected #{s.count - o.count} procedures"
-                puts "Rejected:"
-                ((o-s)|(s-o)).each do |x| puts x.name end
-                puts "---"
-                o
+            when :+; s | index.procedures.select(&pair.last)
+            when :-; s.reject(&pair.last)
             end
           end
         end

data/lib/piggly/config.rb

@@ -45,15 +45,15 @@ module Piggly
   end
 
   class Config
-    config_accessor \
-      :cache_root       => File.expand_path("#{Dir.pwd}/piggly/cache"),
-      :report_root      => File.expand_path("#{Dir.pwd}/piggly/reports"),
-      :database_yml     => nil,
-      :connection_name  => "piggly",
-      :trace_prefix     => "PIGGLY",
-      :accumulate       => false,
-      :dry_run          => false,
-      :filters          => []
+    attr_accessor \
+      :cache_root,
+      :report_root,
+      :database_yml,
+      :connection_name,
+      :trace_prefix,
+      :accumulate,
+      :dry_run,
+      :filters
 
     alias accumulate? accumulate
 
@@ -64,5 +64,16 @@ module Piggly
     def mkpath(*args)
       self.class.mkpath(*args)
     end
+
+    def initialize
+      @cache_root       = File.expand_path("#{Dir.pwd}/piggly/cache")
+      @report_root      = File.expand_path("#{Dir.pwd}/piggly/reports")
+      @database_yml     = nil
+      @connection_name  = "piggly"
+      @trace_prefix     = "PIGGLY"
+      @accumulate       = false
+      @dry_run          = false
+      @filters          = []
+    end
   end
 end

data/lib/piggly/version.rb

@@ -2,9 +2,9 @@ module Piggly
   module VERSION
     MAJOR = 2
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
-    RELEASE_DATE = "2017-09-07"
+    RELEASE_DATE = "2017-10-13"
   end
 
   class << VERSION

data/spec/examples/config_spec.rb

@@ -17,15 +17,15 @@ describe Config do
   end
 
   it "has default values" do
-    @config.cache_root = nil
+  # @config.cache_root = nil
     @config.cache_root.should_not be_nil
     @config.cache_root.should =~ /cache$/
 
-    @config.report_root = nil
+  # @config.report_root = nil
     @config.report_root.should_not be_nil
     @config.report_root.should =~ /reports$/
 
-    @config.trace_prefix = nil
+  # @config.trace_prefix = nil
     @config.trace_prefix.should_not be_nil
     @config.trace_prefix.should == 'PIGGLY'
   end

data/spec/issues/032_spec.rb

@@ -0,0 +1,102 @@
+require "spec_helper"
+
+module Piggly
+  describe "github issue #32" do
+
+    # note: both -r always subtracts and -s always adds
+    # from left-to-right (first-to-last), so -r Y -s Y
+    # or -s Y -r Y undo each other and have no effect.
+    #
+    # if the first filter is -s, then the set starts empty
+    # and -s adds to it.
+    #
+    # if the first filter is -r, then the set starts with
+    # all procedures and -r removes from it.
+
+
+    def result(args)
+      index = double("index", :procedures => [
+                double("public.a", :name => "public.a"),
+                double("public.b", :name => "public.b"),
+                double("public.c", :name => "public.c"),
+                double("public.d", :name => "public.d")])
+      config = Command::Trace.configure(args.dup)
+      p config.object_id, config.filters.object_id
+
+      result = Command::Trace.filter(config, index)
+      result.map(&:name).sort
+    end
+    
+    context "with one -s argument" do
+      let(:args) { %w(-s public.c) }
+
+      it "selects matching procs" do
+        result(args).should == ["public.c"]
+      end
+    end
+
+    context "with -s regular expression" do
+      let(:args) { %w(-s /public.[bcd]/) }
+
+      it "selects matching procs" do
+        result(args).should == [
+          "public.b",
+          "public.c",
+          "public.d"]
+      end
+    end
+
+    context "with two -s arguments" do
+      let(:args) { %w(-s public.b -s public.d) }
+
+      it "adds matching procs" do
+        result(args).should == [
+          "public.b",
+          "public.d"] #
+      end
+    end
+
+    context "with one -r argument" do
+      let(:args) { %w(-r public.c) }
+
+      it "rejects matching procs" do
+        result(args).should == [
+          "public.a",
+          "public.b",
+          "public.d"] #
+      end
+    end
+
+    context "with two -r arguments" do
+      let(:args) { %w(-r public.b -r public.d) }
+
+      it "subtracts rejected procs" do
+        result(args).should == [
+          "public.a",
+          "public.c"]
+      end
+    end
+
+    context "with -s then -r" do
+      let(:args) { %w(-s /\.[abc]/ -r public.b -r public.d) }
+
+      it "-r removes from -s matches" do
+        result(args).should == [
+          "public.a",
+          "public.c"]
+      end
+    end
+
+    context "with -r then -s" do
+      let(:args) { %w(-r /\.[bc]/ -s public.b -s public.a) }
+
+      it "-s adds to -r non-matches" do
+        result(args).should == [
+          "public.a",
+          "public.b",
+          "public.d"]
+      end
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -7,10 +7,6 @@ end
 require "ostruct"
 require File.expand_path("#{File.dirname(__FILE__)}/../lib/piggly")
 
-#Dir[File.join(File.dirname(__FILE__), 'mocks', '*')].each do |m|
-#  require File.expand_path(m)
-#end
-
 # load runtime dependencies
 Piggly::Parser.parser
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: piggly
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Kvle Putnam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -90,7 +90,6 @@ files:
 - lib/piggly/util/process_queue.rb
 - lib/piggly/util/thunk.rb
 - lib/piggly/version.rb
-- spec/028_spec.rb
 - spec/examples/compiler/cacheable_spec.rb
 - spec/examples/compiler/report_spec.rb
 - spec/examples/compiler/trace_spec.rb
@@ -135,6 +134,8 @@ files:
 - spec/issues/007_spec.rb
 - spec/issues/008_spec.rb
 - spec/issues/018_spec.rb
+- spec/issues/028_spec.rb
+- spec/issues/032_spec.rb
 - spec/spec_helper.rb
 - spec/spec_suite.rb
 homepage: http://github.com/kputnam/piggly