ios_parser 0.7.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ca27e440ca7f9a38c976bff002dc996725d77e1ec3fcd12749e119b910ed08d
-  data.tar.gz: 5c59a60ccdf9c10e5d6fd8841dfb2eac7fae046b3447aa401cc61982210d9b08
+  metadata.gz: 1af0b045e17fe043f6309c0d39c47dad8a193890fbac92cdebd7e64363047a71
+  data.tar.gz: dd52ebd34d8571a5accf1304007a22cfec3347a3225ec7d5f7ed6495eb7cd6fd
 SHA512:
-  metadata.gz: 68394ff82c8d23b91accdd947529e352d09459d1fd6a5747ab4bb3ec7a53863b01cf8079fffb0e3f9b941c443451664e2acd2c4201ba7c06cea5b6bfe4ab584a
-  data.tar.gz: 33106cf36832dc6d082f278bf5d2a324d03274b37eb496828b29180587e812577b94387bcb9ec6428ed961710da9662c9b24b6b2923fe4f35003e196dcbd95f2
+  metadata.gz: ec03dae6277cea48f160fec4613746a06a74dce16d96841eff20569b481a5b9bffccaa425501e95c07b248b60952b9f48a475135735dc02917949511d9064756
+  data.tar.gz: 10db031217e4488e390f35a6f071f691c20ba60f8a838879e24f4e29987da18068459367504c95e6d0853949a337e0b890cc9aab60b936c8f7bec9e9fb67fa2b

data/.github/workflows/ruby.yml

@@ -0,0 +1,48 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: 
+        - '2.0'
+        - '2.1'
+        - '2.2'
+        - '2.3'
+        - '2.4'
+        - '2.5'
+        - '2.6'
+        - '2.7'
+        - '3.0'
+        - '3.1'
+        - jruby-9.1.17.0
+        - jruby-9.2.21.0
+        - jruby-9.3.6.0
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      # https://github.com/ruby/setup-ruby#versioning
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/ios_parser.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
     s.extensions << 'ext/ios_parser/c_lexer/extconf.rb'
   end
 
+  s.required_ruby_version = '>=2.0'
+
   s.add_development_dependency 'rake-compiler', '~>0.9'
   s.add_development_dependency 'rspec', '~>3.2'
   s.add_development_dependency 'rubocop', '~> 0.54' if RUBY_VERSION > '2.1'

data/lib/ios_parser/ios/command.rb

@@ -21,7 +21,7 @@ module IOSParser
       end
 
       def name
-        tokens.first.value
+        (tokens.first) && tokens.first.value
       end
 
       def ==(other)
@@ -64,7 +64,7 @@ module IOSParser
 
       def to_s(dedent: false)
         indent_opts = { base: dedent ? path.length : 0 }
-        map { |cmd| "#{cmd.indentation(indent_opts)}#{cmd.line}\n" }.join
+        map { |cmd| "#{cmd.indentation(**indent_opts)}#{cmd.line}\n" }.join
       end
 
       def to_hash
@@ -92,7 +92,7 @@ module IOSParser
           hash[:commands].each_index do |i|
             hash[:commands][i] = from_hash(hash[:commands][i])
           end
-          new(hash)
+          new(**hash)
         end
       end
     end # class Command

data/lib/ios_parser/ios.rb

@@ -46,7 +46,7 @@ module IOSParser
         indent: @indent
       }
 
-      Command.new(opts).tap do |cmd|
+      Command.new(**opts).tap do |cmd|
         cmd.commands = subsections(cmd)
       end
     end

data/lib/ios_parser/lexer.rb

@@ -287,7 +287,8 @@ module IOSParser
         ('A'..'Z').cover?(char) ||
         ['-', '+', '$', ':', '/', ',', '(', ')', '|', '*', '#', '=', '<', '>',
          '!', '"', '&', '@', ';', '%', '~', '{', '}', "'", '?', '[', ']', '_',
-         '^', '\\', '`'].include?(char)
+         '^', '\\', '`'].include?(char) ||
+        /[[:graph:]]/.match(char)
     end
 
     def space

data/lib/ios_parser/version.rb

@@ -1,7 +1,7 @@
 module IOSParser
   class << self
     def version
-      '0.7.1'
+      '0.9.0'
     end
   end
 end

data/spec/lib/ios_parser/pure_spec.rb

@@ -0,0 +1,16 @@
+require_relative '../../spec_helper'
+require 'ios_parser'
+require 'ios_parser/lexer'
+
+module IOSParser
+  describe PureLexer do
+    describe '#call' do
+      it 'accepts non-whitespace printable characters as words' do
+        input = "before emdash – after emdash"
+        tokens = PureLexer.new.call(input)
+        expect(tokens.map(&:value)).to eq %w[before emdash – after emdash]
+        expect(tokens.map(&:col)).to eq [1, 8, 15, 17, 23]
+      end
+    end
+  end
+end

data/spec/lib/ios_parser_spec.rb

@@ -3,6 +3,20 @@ require 'ios_parser'
 
 describe IOSParser do
   describe '.parse' do
+    context 'with blank line at start' do
+      it 'parses and extracts sections' do
+        parser = IOSParser.parse("\ntest config")
+        expect(parser.find_all(name: "test").count).to eq 1
+      end
+    end
+
+    context 'with blank line in middle' do
+      it 'parses and extracts sections' do
+        parser = IOSParser.parse("preamble\n\ntest config")
+        expect(parser.find_all(name: "test").count).to eq 1
+      end
+    end
+
     context 'indented region' do
       let(:input) { <<-END.unindent }
         policy-map mypolicy_in

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ios_parser
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Ben Miller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -59,9 +59,9 @@ extensions:
 - ext/ios_parser/c_lexer/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -89,6 +89,7 @@ files:
 - spec/lib/ios_parser/ios/queryable_spec.rb
 - spec/lib/ios_parser/ios_spec.rb
 - spec/lib/ios_parser/lexer_spec.rb
+- spec/lib/ios_parser/pure_spec.rb
 - spec/lib/ios_parser_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/bjmllr/ios_parser
@@ -103,14 +104,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: convert network switch and router config files to structured data
@@ -118,5 +119,6 @@ test_files:
 - spec/lib/ios_parser/ios/queryable_spec.rb
 - spec/lib/ios_parser/ios_spec.rb
 - spec/lib/ios_parser/lexer_spec.rb
+- spec/lib/ios_parser/pure_spec.rb
 - spec/lib/ios_parser_spec.rb
 - spec/spec_helper.rb

data/.travis.yml

@@ -1,17 +0,0 @@
-language: ruby
-rvm:
-  - 2.0.0
-  - 2.1.10
-  - 2.2.10
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - jruby-9.1.16.0
-  - jruby-9.2.0.0
-matrix:
-  include:
-    - rvm: jruby
-      env: JRUBY_OPTS='-Xcompat.version=2.0'
-bundler_args: --without guard
-before_install:
-  - if [ "jruby" != "$TRAVIS_RUBY_VERSION"  ]; then gem i rubygems-update -v '<3' && update_rubygems; gem install bundler -v 1.17.3 --without guard; fi