milkode 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 456e2e0fa0db21bedaaa72af1cf820dd3de2899f
-  data.tar.gz: 248e2f1ebf508ebc6ab2ae595418f85fc88d9fa9
+  metadata.gz: a432906d7cb9dedf6688b795be9573b66e379c8b
+  data.tar.gz: 3d5100c8567be3bb2cc6fa1c3a673c8517ef15a0
 SHA512:
-  metadata.gz: 272e9b638e6aab4f208e0c2a7efca9bb90f0195f54523acb4da1c23c03a22e3f09d0c3a93cdc43301c23f288d6ec1aa75b6f8b117e2ed6c514d31637e211d0f1
-  data.tar.gz: 2b979b9d32ead5d8d9ed26a414e6c741d733c845c4a0f51f003ae86eade414af8295db843636403053f9c17473846ab79c34c782ed2c12d48227f2b88baec0c2
+  metadata.gz: 41970fcfa6ba574092643ae8a68a4d0660383a9e626008a4f00273becd3fff7c5b556f15a6533e84b8e196054374ccac6d74b44d07bbc36527ef49bc2b156af8
+  data.tar.gz: fe3cb53ed37fd66c2e62bfae30cde65ee220c1116295b2285c6b4772d052091dbfa64df3e7ebd0c027b2c96b7c979b55064e068aa39e715de582069f3d6952a7

data/lib/milkode/common/grenfiletest.rb

@@ -5,11 +5,21 @@ module GrenFileTest
   IGNORE_DIR = /(\A\.svn\Z)|(\A\.git\Z)|(\ACVS\Z)/
 
   def self.ignoreDir?(fpath)
-    IGNORE_DIR.match(File.basename(fpath))
+    begin
+      IGNORE_DIR.match(File.basename(fpath))
+    rescue ArgumentError => e
+      puts "[skip dir] #{fpath}: #{e.to_s}"
+      true
+    end
   end
 
   def self.ignoreFile?(fpath)
-    IGNORE_FILE.match(File.basename(fpath))
+    begin
+      IGNORE_FILE.match(File.basename(fpath))
+    rescue ArgumentError => e
+      puts "[skip] #{fpath}: #{e.to_s}"
+      true
+    end
   end
 
   def self.binary?(fpath)

data/lib/milkode/version.rb

@@ -1,3 +1,3 @@
 module Milkode
-  VERSION = "1.8.2"
+  VERSION = "1.8.3"
 end

data/test/test_milkode_yaml.rb

@@ -7,7 +7,6 @@
 
 require 'test_helper'
 require 'milkode/cdstk/milkode_yaml.rb'
-require 'milkode/common/util'
 
 class TestMilkodeYaml < Test::Unit::TestCase
   include Milkode
@@ -32,25 +31,9 @@ contents:
 - directory: /path/to/dir
 EOF
 
-  # YAML#dumpの出力形式が1.8と1.9で変わってしまったので、1.8の時はテストしない
-
   def test_dump
     obj = MilkodeYaml.new(SRC)
-    if Milkode::Util.ruby20?
-      assert_equal SRC, obj.dump
-    elsif Milkode::Util.ruby19?
-      assert_equal <<EOF, obj.dump
----
-version: '0.2'
-contents:
-- directory: /a/dir1
-- directory: /path/to/dir
-  ignore:
-  - ! '*.bak'
-  - /rdoc
-- directory: /a/b/c
-EOF
-    end
+    assert_equal YAML.load(SRC), YAML.load(obj.dump)
   end
 
   def test_version
@@ -75,7 +58,7 @@ EOF
 
     assert_equal 1, obj.contents.size
 
-    assert_equal <<EOF, obj.dump  if Milkode::Util.ruby19?
+    assert_equal YAML.load(<<EOF), YAML.load(obj.dump)
 ---
 version: '0.2'
 contents:
@@ -89,8 +72,7 @@ EOF
 
     assert_equal 2, obj.contents.size
 
-    if Milkode::Util.ruby20?
-      assert_equal <<EOF, obj.dump
+    assert_equal YAML.load(<<EOF), YAML.load(obj.dump)
 ---
 version: '0.2'
 contents:
@@ -100,19 +82,6 @@ contents:
   - '*.bak'
   - /rdoc
 EOF
-    elsif Milkode::Util.ruby19?
-      assert_equal <<EOF, obj.dump
----
-version: '0.2'
-contents:
-- directory: /a/dir1
-- directory: /path/to/dir
-  ignore:
-  - ! '*.bak'
-  - /rdoc
-EOF
-    end
-
   end
 
   def test_migrate
@@ -122,14 +91,13 @@ EOF
     obj = MilkodeYaml.new(V_0_1)
     assert_equal true, obj.migrate
 
-    assert_equal <<EOF, obj.dump if Milkode::Util.ruby19?
+    assert_equal YAML.load(<<EOF), YAML.load(obj.dump)
 ---
 version: '0.2'
 contents:
 - directory: /a/dir1
 - directory: /path/to/dir
 EOF
-    
   end
 
   def test_find_name
@@ -145,8 +113,7 @@ EOF
     p = Package.create(p.directory, p.ignore + ['*.a'])
     obj.update(p)
 
-    if Milkode::Util.ruby20?
-      assert_equal <<EOF, obj.dump
+    assert_equal YAML.load(<<EOF), YAML.load(obj.dump)
 ---
 version: '0.2'
 contents:
@@ -158,21 +125,6 @@ contents:
   - '*.a'
 - directory: /a/b/c
 EOF
-    elsif Milkode::Util.ruby19?
-      assert_equal <<EOF, obj.dump
----
-version: '0.2'
-contents:
-- directory: /a/dir1
-- directory: /path/to/dir
-  ignore:
-  - ! '*.bak'
-  - /rdoc
-  - ! '*.a'
-- directory: /a/b/c
-EOF
-    end
-
 
     p = Package.create("not_found")
     assert_raise(RuntimeError) { obj.update(p) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milkode
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - ongaeshi