mtree 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e07ec004e1b016ffad3ce93f09d80009859db4d73afbc6aa0657514a032d1a55
-  data.tar.gz: d33eea6de1e3fc2934d404d0d7b684f78b5c99e0ee63d4a98326429320e9d05e
+  metadata.gz: 314d213f66e3a73b88dfb0e2692c924ea5cec80f6332673e7612e3cc31cab7bc
+  data.tar.gz: 7cfcfeaf8c7aad5954825d9a35cf7e17286e43a7792378fb15ca2f3e77eaba43
 SHA512:
-  metadata.gz: 3f26621da0b4658b23199632b7722d3b62fc5375933f82679c86092867e9bf89158f053bdae016ba4ff822c39aa182ac149a03a5a3691843f9430b84ed27c5d9
-  data.tar.gz: 61048a3f80af78a046aac04b0ef2886c13ad9a933e8d4b5e3aee50b4027f670163777ef5d6f96380e5e67d7584aadff4a2f0521020d67bd624fb1102ac037faa
+  metadata.gz: cdf9ccd76bb58d262555621c76c946d84ec0895ea50c5e7dc40254d6be1e7409a1dbb2dd9afb545cb28691c880b4877dda22945792c60c994ea4b1ed950f83cc
+  data.tar.gz: 81c1c6b709c667ea806fa6862e2ca366efab3637918bcde43b9c8f5252d63ccae4df2266b9ad3efdbbde0c623b0323f5719f426ff56239e7a522d3528ef2b5ca

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @opus-codium/core

data/.github/workflows/ci.yml

@@ -0,0 +1,50 @@
+---
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0
+          bundler-cache: true
+      - name: Run static code analysis
+        run: bundle exec rubocop
+  unit:
+    runs-on: ubuntu-latest
+    needs: rubocop
+    strategy:
+      matrix:
+        ruby:
+          - "2.7"
+          - "3.0"
+          - "3.1"
+    name: Ruby ${{ matrix.ruby }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run tests without uploading code coverage
+        if: ${{ matrix.ruby != '3.0' }}
+        run: bundle exec rake
+      - name: Run tests and upload coverage to Code Climate
+        if: ${{ matrix.ruby == '3.0' }}
+        uses: paambaati/codeclimate-action@v3.0.0
+        env:
+          CC_TEST_REPORTER_ID: ${{ secrets.CODECLIMATE_TOKEN }}
+        with:
+          coverageCommand: bundle exec rake

data/.gitignore

@@ -4,6 +4,7 @@
 /coverage/
 /doc/
 /pkg/
+/lib/mtree/parser.tab.rb
 /spec/reports/
 /tmp/
 /Gemfile.lock

data/.rubocop.yml

@@ -1,16 +1,20 @@
 AllCops:
   Exclude:
     - 'lib/mtree/parser.tab.rb'
+    - 'vendor/bundle/**/*'
 
 Metrics/LineLength:
   Enabled: false
 
 Metrics/BlockLength:
-  Exclude:
-    - 'spec/**/*.rb'
+  Enabled: false
 
 Style/Documentation:
   Enabled: false
 
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: consistent_comma
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: consistent_comma
 Style/TrailingCommaInHashLiteral:
-  Enabled: false
+  EnforcedStyleForMultiline: consistent_comma

data/CHANGELOG.md

@@ -0,0 +1,21 @@
+# Changelog
+
+## [v1.0.1](https://github.com/opus-codium/mtree/tree/v1.0.1) (2022-10-17)
+
+[Full Changelog](https://github.com/opus-codium/mtree/compare/v1.0.0...v1.0.1)
+
+**Fixed bugs:**
+
+- Fix creation of links in place of directories [\#6](https://github.com/opus-codium/mtree/pull/6) ([smortex](https://github.com/smortex))
+- Fix `mtree --check` [\#4](https://github.com/opus-codium/mtree/pull/4) ([neomilium](https://github.com/neomilium))
+
+**Merged pull requests:**
+
+- Remove generated parser from the repo [\#7](https://github.com/opus-codium/mtree/pull/7) ([smortex](https://github.com/smortex))
+- Add a CODEOWNER file [\#5](https://github.com/opus-codium/mtree/pull/5) ([smortex](https://github.com/smortex))
+- Parser improvements [\#2](https://github.com/opus-codium/mtree/pull/2) ([smortex](https://github.com/smortex))
+- Add CI [\#1](https://github.com/opus-codium/mtree/pull/1) ([smortex](https://github.com/smortex))
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }

data/Rakefile

@@ -1,11 +1,29 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'github_changelog_generator/task'
 
 RSpec::Core::RakeTask.new(:spec)
 
+GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+  config.user = 'opus-codium'
+  config.project = 'mtree'
+  config.exclude_labels = ['skip-changelog']
+  config.future_release = "v#{Mtree::VERSION}"
+  config.since_tag = 'v1.0.0'
+end
+
 task default: :spec
 
+task build: :gen_parser
+task spec: :gen_parser
+
 desc "Generate the mtree parser's code"
-task :parser do
-  sh 'racc lib/mtree/parser.y'
+task gen_parser: [
+  'lib/mtree/parser.tab.rb',
+]
+
+file 'lib/mtree/parser.tab.rb' => 'lib/mtree/parser.y' do
+  sh 'racc -S lib/mtree/parser.y'
 end

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'mtree'

data/exe/mtree

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'mtree'
 
@@ -82,9 +83,7 @@ options[:user_mapping].each do |from, to|
   end
 end
 
-if options[:symlink_to]
-  specifications.symlink_to!(options[:symlink_to])
-end
+specifications.symlink_to!(options[:symlink_to]) if options[:symlink_to]
 
 case options[:action]
 when :update

data/lib/mtree/file_specification.rb

@@ -1,5 +1,9 @@
+# frozen_string_literal: true
+
+require 'etc'
+
 module Mtree
-  class FileSpecification
+  class FileSpecification # rubocop:disable Metrics/ClassLength
     # VALID_ATTRIBUTES = %i[cksum device flags gid gname link md5 mode nlink nochange optional rmd160 sha1 sha256 sha384 sha512 size tags time type uid uname].freeze
     VALID_ATTRIBUTES = %i[gid gname link mode nochange optional type uid uname].freeze
 
@@ -13,9 +17,7 @@ module Mtree
       end
     end
 
-    attr_accessor :filename
-    attr_accessor :relative_path
-    attr_accessor :children
+    attr_accessor :filename, :relative_path, :children
 
     def initialize(filename, attributes = {})
       @filename = filename
@@ -23,11 +25,12 @@ module Mtree
       if (invalid_keys = attributes.keys - VALID_ATTRIBUTES) != []
         raise "Unsupported attribute: #{invalid_keys.first}"
       end
+
       @attributes = attributes
       @children = []
     end
 
-    def match?(root)
+    def match?(root) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
       res = true
       problems = []
 
@@ -35,9 +38,7 @@ module Mtree
         @attributes.each do |attr, expected|
           actual = send("current_#{attr}", root)
 
-          if expected != actual
-            problems << { attr: attr, expected: expected, actual: actual }
-          end
+          problems << { attr: attr, expected: expected, actual: actual } if expected != actual
         end
       rescue Errno::ENOENT
         puts "#{relative_path} missing"
@@ -85,7 +86,9 @@ module Mtree
       case type
       when 'dir'  then FileUtils.mkdir_p(full_filename(root))
       when 'file' then FileUtils.touch(full_filename(root))
-      when 'link' then FileUtils.ln_s(link, full_filename(root), force: true)
+      when 'link'
+        FileUtils.rm_rf(full_filename(root))
+        FileUtils.ln_s(link, full_filename(root))
       end
       update(root)
     end
@@ -134,7 +137,7 @@ module Mtree
       "#{filename} #{attributes}\n#{descendent}..\n"
     end
 
-    def attributes
+    def attributes # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
       parts = []
 
       parts << format('gid=%d', gid)     if gid

data/lib/mtree/parser.tab.rb

@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.14
-# from Racc grammer file "".
+# This file is automatically generated by Racc 1.6.0
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
@@ -12,7 +12,7 @@ require 'strscan'
 module Mtree
   class Parser < Racc::Parser
 
-module_eval(<<'...end parser.y/module_eval...', 'parser.y', 33)
+module_eval(<<'...end parser.y/module_eval...', 'parser.y', 38)
 
 attr_accessor :yydebug
 attr_accessor :defaults
@@ -69,17 +69,17 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-    14,    12,     8,    16,    17,    18,    19,    20,    21,    22,
+    14,     8,    12,    16,    17,    18,    19,    20,    21,    22,
     23,    24,    13,   nil,    16,    17,    18,    19,    20,    21,
     22,    23,     4,     7,     5,     6,     4,     7,     5,     6 ]
 
 racc_action_check = [
-    10,     6,     1,    10,    10,    10,    10,    10,    10,    10,
+    10,     1,     6,    10,    10,    10,    10,    10,    10,    10,
     10,    11,     8,   nil,    11,    11,    11,    11,    11,    11,
-    11,    11,     2,     2,     2,     2,     0,     0,     0,     0 ]
+    11,    11,     0,     0,     0,     0,     2,     2,     2,     2 ]
 
 racc_action_pointer = [
-    24,     2,    20,   nil,   nil,   nil,    -2,   nil,    12,   nil,
+    20,     1,    24,   nil,   nil,   nil,    -1,   nil,    12,   nil,
     -3,     8,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil ]
 
@@ -191,7 +191,7 @@ Racc_debug_parser = false
 
 module_eval(<<'.,.,', 'parser.y', 2)
   def _reduce_1(val, _values, result)
-     if @path_components.any? then raise 'Malformed specifications' end 
+     if @path_components.any? then raise 'Malformed specifications' end
     result
   end
 .,.,
@@ -204,93 +204,97 @@ module_eval(<<'.,.,', 'parser.y', 2)
 
 module_eval(<<'.,.,', 'parser.y', 8)
   def _reduce_5(val, _values, result)
-     @defaults.merge!(val[1]) 
+     @defaults.merge!(val[1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 9)
+module_eval(<<'.,.,', 'parser.y', 10)
   def _reduce_6(val, _values, result)
-     spec = Mtree::FileSpecification.new(val[0], @defaults.merge(val[1])); if @specifications.nil? then @specifications = spec end; if @path_components.last then @path_components.last << spec end; @path_components.push(spec) 
+                                                      spec = Mtree::FileSpecification.new(val[0], @defaults.merge(val[1]))
+                                                  @specifications ||= spec
+                                                  @path_components.last << spec if @path_components.last
+                                                  @path_components.push(spec)
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 10)
+module_eval(<<'.,.,', 'parser.y', 15)
   def _reduce_7(val, _values, result)
-     @path_components.pop 
+     @path_components.pop
     result
   end
 .,.,
 
 # reduce 8 omitted
 
-module_eval(<<'.,.,', 'parser.y', 13)
+module_eval(<<'.,.,', 'parser.y', 18)
   def _reduce_9(val, _values, result)
-     result = val[0].merge(val[1]) 
+     result = val[0].merge(val[1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 14)
+module_eval(<<'.,.,', 'parser.y', 19)
   def _reduce_10(val, _values, result)
-     result = {} 
+     result = {}
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 16)
+module_eval(<<'.,.,', 'parser.y', 21)
   def _reduce_11(val, _values, result)
-     result = { gid:      Integer(val[0]) } 
+     result = { gid:      Integer(val[0]) }
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 17)
+module_eval(<<'.,.,', 'parser.y', 22)
   def _reduce_12(val, _values, result)
-     result = { gname:    val[0] } 
+     result = { gname:    val[0] }
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 18)
+module_eval(<<'.,.,', 'parser.y', 23)
   def _reduce_13(val, _values, result)
-     result = { mode:     Integer(val[0], 8) } 
+     result = { mode:     Integer(val[0], 8) }
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 19)
+module_eval(<<'.,.,', 'parser.y', 24)
   def _reduce_14(val, _values, result)
-     result = { nochange: true } 
+     result = { nochange: true }
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 20)
+module_eval(<<'.,.,', 'parser.y', 25)
   def _reduce_15(val, _values, result)
-     result = {} 
+     result = {}
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 21)
+module_eval(<<'.,.,', 'parser.y', 26)
   def _reduce_16(val, _values, result)
-     result = { type:     val[0] } 
+     result = { type:     val[0] }
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 22)
+module_eval(<<'.,.,', 'parser.y', 27)
   def _reduce_17(val, _values, result)
-     result = { uid:      Integer(val[0]) } 
+     result = { uid:      Integer(val[0]) }
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 23)
+module_eval(<<'.,.,', 'parser.y', 28)
   def _reduce_18(val, _values, result)
-     result = { uname:    val[0] } 
+     result = { uname:    val[0] }
     result
   end
 .,.,
@@ -300,4 +304,4 @@ def _reduce_none(val, _values, result)
 end
 
   end   # class Parser
-  end   # module Mtree
+end   # module Mtree

data/lib/mtree/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mtree
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'
 end

data/lib/mtree.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mtree/file_specification'
 require 'mtree/parser.tab'
 require 'mtree/version'

data/mtree.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mtree/version'
@@ -12,19 +14,30 @@ Gem::Specification.new do |spec|
   spec.description   = 'This is a ruby utility and library providing the mtree(1) features found on BSDs.'
   spec.homepage      = 'https://github.com/opus-codium/mtree'
   spec.license       = 'MIT'
+  spec.required_ruby_version = '>= 2.7'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } -
+      [
+        'lib/mtree/parser.y',
+      ] +
+      [
+        'lib/mtree/parser.tab.rb',
+      ]
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'github_changelog_generator'
   spec.add_development_dependency 'racc'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'simplecov'
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: mtree
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Romain Tartière
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
@@ -42,30 +56,72 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -89,10 +145,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CODEOWNERS"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -104,14 +162,13 @@ files:
 - lib/mtree.rb
 - lib/mtree/file_specification.rb
 - lib/mtree/parser.tab.rb
-- lib/mtree/parser.y
 - lib/mtree/version.rb
 - mtree.gemspec
 homepage: https://github.com/opus-codium/mtree
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -119,16 +176,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.3.22
+signing_key:
 specification_version: 4
 summary: Manage a directory hierarchy
 test_files: []

data/.travis.yml

@@ -1,9 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-before_install: gem install bundler -v 1.16.3

data/lib/mtree/parser.y

@@ -1,84 +0,0 @@
-class Mtree::Parser
-rule
-  target: expressions { if @path_components.any? then raise 'Malformed specifications' end }
-        |
-
-  expressions: expressions expression
-             | expression
-
-  expression: SET attributes LINE_BREAK         { @defaults.merge!(val[1]) }
-            | IDENTIFIER attributes LINE_BREAK  { spec = Mtree::FileSpecification.new(val[0], @defaults.merge(val[1])); if @specifications.nil? then @specifications = spec end; if @path_components.last then @path_components.last << spec end; @path_components.push(spec) } # @path_components.push(val[0]); @specifications.push() }
-            | DOT_DOT LINE_BREAK                { @path_components.pop }
-            | LINE_BREAK
-
-  attributes: attributes attribute { result = val[0].merge(val[1]) }
-            |                      { result = {} }
-
-  attribute: GID      { result = { gid:      Integer(val[0]) } }
-           | GNAME    { result = { gname:    val[0] } }
-           | MODE     { result = { mode:     Integer(val[0], 8) } }
-           | NOCHANGE { result = { nochange: true } }
-	   | TAGS     { result = {} }
-           | TYPE     { result = { type:     val[0] } }
-           | UID      { result = { uid:      Integer(val[0]) } }
-           | UNAME    { result = { uname:    val[0] } }
-end
-
-
----- header
-
-require 'strscan'
-
----- inner
-
-attr_accessor :yydebug
-attr_accessor :defaults
-
-attr_reader :specifications
-
-def initialize
-  super
-  @defaults = {}
-  @path_components = []
-  @specifications = nil
-end
-
-def parse(text)
-  s = StringScanner.new(text)
-
-  tokens = []
-  until s.eos? do
-    case
-    when s.scan(/#.*/);                   # Ignore comment
-    when s.scan(/[[:blank:]]+/);          # Ignore blanks
-    when s.scan(/\n/);                    tokens << [:LINE_BREAK, s.matched]
-    when s.scan(/\.\./);                  tokens << [:DOT_DOT, s.matched]
-    when s.scan(/\/set\b/);               tokens << [:SET, s.matched]
-    when s.scan(/gid=([[:digit:]]+)/);    tokens << [:GID, s[1]]
-    when s.scan(/gname=([[:alnum:]]+)/);  tokens << [:GNAME, s[1]]
-    when s.scan(/mode=([[:digit:]]+)/);   tokens << [:MODE, s[1]]
-    when s.scan(/nochange\b/);            tokens << [:NOCHANGE, s[1]]
-    when s.scan(/tags=([[:print:]]+)\b/); tokens << [:TAGS, s[1]]
-    when s.scan(/type=(dir|file)/);       tokens << [:TYPE, s[1]]
-    when s.scan(/uid=([[:digit:]]+)/);    tokens << [:UID, s[1]]
-    when s.scan(/uname=([[:alnum:]]+)/);  tokens << [:UNAME, s[1]]
-    when s.scan(/[^[:space:]]+/);         tokens << [:IDENTIFIER, s.matched]
-    else
-      raise "No match: #{s.rest}"
-    end
-  end
-
-  define_singleton_method(:next_token) { tokens.shift }
-
-  tokens << [false, false]
-
-  # tokens.each do |t|
-  #   puts t.inspect
-  # end
-
-  do_parse
-end
-
-def parse_file(filename)
-  parse(File.read(filename))
-end