zapwhite 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d600950045fedd54e58ec96c8f16ae33fbb5b47
-  data.tar.gz: 3930e8dbc432f14afc6261113ccaa831567e93a1
+  metadata.gz: 81bcca5ce52c55d266fdfa3cffde9ce3cd270669
+  data.tar.gz: 9b2c1de397485ca1897e159fc5872dbd56e2ddfe
 SHA512:
-  metadata.gz: a060e4079adf9f52b35b91702c0ab9b51f0aa81d61bfb6cffaa9d27cd36b109e8c3dca519f52af13e5203f05f590ac915e78d4e2f5f1638d3738b1009bc9f1ca
-  data.tar.gz: 70cedf47cf30f7ad4bd0014d78177841987f455e1f09725eea475ac4082dad9aa24fb7046d59029b6715ec9b344786e0f7bb8f4678b774cbad8e92ce2081ade9
+  metadata.gz: a72c6981d8c3bb449503bc2fad48f21d89c989f27d5cbe8ea0301ddb75409dee025ca69fcb4d441207e89039f74da1019712931beb7fb59f4a2edd30d746558a
+  data.tar.gz: de3cb47158d66835ae676bfabf4b8c4280a374aa9bdbad90994660de4791014cb2d111cb19cd52782ebae8fec8c7653bdefa39e5bf0d5c771beda9b7490fd009

data/bin/zapwhite

@@ -6,6 +6,7 @@ require 'bundler/setup'
 require 'optparse'
 require 'reality/zapwhite'
 
+@verbose = false
 @check_only = false
 @generate_gitattributes = true
 @exclude_patterns = []
@@ -33,6 +34,10 @@ OptionParser.new do |opts|
   opts.on('-r', '--rule RULE', 'Additional rule(s) (a.k.a. lines) to add when generating .gitattributes file.') do |rule|
     @rules << rule
   end
+
+  opts.on('-v', '--verbose', 'Print additional information during operation.') do
+    @verbose = true
+  end
 end.parse!
 
 unless ARGV.empty?
@@ -51,4 +56,22 @@ unless @exclude_patterns.empty?
   end
 end
 
+if @verbose
+  puts "Base Directory: #{@base_directory}"
+  puts "Check for violations or fix violations: #{runner.check_only? ? 'check' : 'fix'}"
+  puts "Generate .gitattributes file?: #{runner.generate_gitattributes?}"
+  unless runner.additional_gitattribute_rules.empty?
+    puts 'Additional .gitattribute rules:'
+    runner.additional_gitattribute_rules.each do |rule|
+      puts " * #{rule}"
+    end
+  end
+  unless runner.exclude_patterns.empty?
+    puts 'Exclude patterns:'
+    runner.exclude_patterns.each do |pattern|
+      puts " * #{pattern}"
+    end
+  end
+end
+
 exit runner.run

data/lib/reality/zapwhite.rb

@@ -13,6 +13,7 @@
 #
 
 require 'reality/gitattributes'
+require 'json'
 
 module Reality
   class Zapwhite
@@ -20,7 +21,7 @@ module Reality
     def initialize(base_directory)
       @base_directory = base_directory
       @attributes = Reality::Git::Attributes.parse(@base_directory)
-      @exclude_patterns = %w(vendor/.* node_modules/.*)
+      @exclude_patterns = %w(vendor/.* node_modules/.*) + load_braid_mirrors
       @check_only = false
       @additional_gitattribute_rules = []
     end
@@ -102,6 +103,11 @@ module Reality
 
     private
 
+    def load_braid_mirrors
+      braid_file = "#{@base_directory}/.braids.json"
+      File.exist?(braid_file) ? JSON.parse(IO.read(braid_file)).keys : []
+    end
+
     def generate_gitattributes!
       attributes = Reality::Git::Attributes.new(@base_directory)
       template = create_template_gitattributes

data/test/reality/test_zapwhite.rb

@@ -179,5 +179,91 @@ TEXT
     end
   end
 
+  def test_verbose_mode
+    dir = create_git_repo do
+      write_file('README.md', "Hello\n")
+    end
+    in_dir(dir) do
+      output = run_command("#{ZAPWHITE_BIN} --generate-gitattributes --rule '*.bin -diff' --rule '*.rxt text' --verbose", 1)
+      assert_equal <<OUTPUT, output
+Base Directory: #{dir}
+Check for violations or fix violations: fix
+Generate .gitattributes file?: true
+Additional .gitattribute rules:
+ * *.bin -diff
+ * *.rxt text
+Exclude patterns:
+ * vendor/.*
+ * node_modules/.*
+Fixing: .gitattributes
+OUTPUT
+    end
+  end
 
+  def test_braids_are_added_to_excludes
+    dir = create_git_repo do
+      write_file('README.md', "Hello\n")
+      write_file('.braids.json',<<BRAIDS_JSON)
+{
+  "vendor/docs/way_of_stock": {
+    "url": "https://github.com/stocksoftware/way_of_stock.git",
+    "branch": "master",
+    "revision": "0405926c5b4229e7d1f605a65603df64b5667f2d"
+  },
+  "vendor/tools/buildr_plus": {
+    "url": "https://github.com/realityforge/buildr_plus.git",
+    "branch": "master",
+    "revision": "4a4a0666871861de1ddc7581a02d6d656702fa6b"
+  },
+  "vendor/tools/dbt": {
+    "branch": "master",
+    "revision": "554139d3ea275bd54949b9504090c77e4d39ba65",
+    "url": "https://github.com/realityforge/dbt.git"
+  },
+  "vendor/tools/domgen": {
+    "branch": "master",
+    "revision": "1da8f5d43f9c84ac234c6354af8717bcfde03f88",
+    "url": "https://github.com/realityforge/domgen.git"
+  },
+  "vendor/tools/kinjen": {
+    "url": "https://github.com/realityforge/kinjen.git",
+    "branch": "master",
+    "revision": "34a962de77918bc1a76f1fcf8c92fe6721d5b524"
+  },
+  "vendor/tools/redfish": {
+    "url": "https://github.com/realityforge/redfish.git",
+    "branch": "master",
+    "revision": "5e6bb18009e682c09631e1234c955373735d27ab"
+  },
+  "vendor/tools/resgen": {
+    "url": "https://github.com/realityforge/resgen.git",
+    "branch": "master",
+    "revision": "631a5aa371d3c6f2a68c95e5da3ca8e16a6ee0c7"
+  }
+}
+BRAIDS_JSON
+    end
+    in_dir(dir) do
+      output = run_command("#{ZAPWHITE_BIN} --generate-gitattributes --rule '*.bin -diff' --rule '*.rxt text' --verbose", 1)
+      assert_equal <<OUTPUT, output
+Base Directory: #{dir}
+Check for violations or fix violations: fix
+Generate .gitattributes file?: true
+Additional .gitattribute rules:
+ * *.bin -diff
+ * *.rxt text
+Exclude patterns:
+ * vendor/.*
+ * node_modules/.*
+ * vendor/docs/way_of_stock
+ * vendor/tools/buildr_plus
+ * vendor/tools/dbt
+ * vendor/tools/domgen
+ * vendor/tools/kinjen
+ * vendor/tools/redfish
+ * vendor/tools/resgen
+Fixing: .gitattributes
+OUTPUT
+    end
+  end
 end

data/zapwhite.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name               = %q{zapwhite}
-  s.version            = '2.6.0'
+  s.version            = '2.7.0'
   s.platform           = Gem::Platform::RUBY
 
   s.authors            = ['Peter Donald']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zapwhite
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Peter Donald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitattributes