ios_parser 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abbb84cb462b8506f141ce88c1333f8f25e8bc9f31e5bc166d2f76f275044529
-  data.tar.gz: 7ed4f70c4396caae3d84df7dc17176b5a4c1e1f4eede31cdf63af8d34c61285f
+  metadata.gz: d622ced70b173f1c2b514b3060694ecf722641e098367551ac66878c40059c5f
+  data.tar.gz: 20fedb53829b28a18ce1d5aa72107b13534ea3b01118a7b988fc6f4b4d01a83c
 SHA512:
-  metadata.gz: 209623e73042e19dd5bb9108f3aee56ab357e2b84ad388f028e1055cf90eee73fc9040c448e6e394729880a3690abc38e2c945371dac73a7004db3bab78180a2
-  data.tar.gz: dc1b41a7d3e821d9bfdb2ce9e4b6cad8012396b2ba3ed1e39b56eecc7582870e829e8cb512ebca9a68ffb281c13aab1c5c7d6af48c53cec9ede3bbcc58078bb5
+  metadata.gz: 5ab205f2e84a5bf71e3bf1ceb1b2b8c5cef6bfcf0900ca4d472fcd1079174a448549efba14d58597eb04cde8f5bf29d5c059db14624b2695b763a75f5468df1f
+  data.tar.gz: 36fd7e6722935457f9c8e3f60231fe37c4c5fe0ee9a6a9922ed45a5a5b9fbd7d26f9b631056298a8b95acdeb7f4c5e6a136b4df9d0ede939918062e292766231

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/ext/ios_parser/c_lexer/lexer.c

@@ -87,6 +87,33 @@ int is_certificate(LexInfo *lex) {
     return 1;
 }
 
+int is_authentication_banner_begin(LexInfo *lex) {
+    VALUE authentication_ary, authentication, banner_ary, banner;
+    int token_count = RARRAY_LEN(lex->tokens);
+    int authentication_pos = token_count -2;
+    int banner_pos = token_count - 1;
+
+    if (banner_pos < 0) { return 0; }
+
+    banner_ary = rb_ary_entry(lex->tokens, banner_pos);
+    banner = TOKEN_VALUE(banner_ary);
+    if (TYPE(banner) != T_STRING) { return 0; }
+
+    StringValue(banner);
+    if (RSTRING_LEN(banner) != CMD_LEN("banner")) { return 0; }
+    if (0 != strncmp(RSTRING_PTR(banner), "banner", 6)) { return 0; }
+
+    authentication_ary = rb_ary_entry(lex->tokens, authentication_pos);
+    authentication = TOKEN_VALUE(authentication_ary);
+    if (TYPE(authentication) != T_STRING) { return 0; }
+
+    StringValue(authentication);
+    if (RSTRING_LEN(authentication) != CMD_LEN("authentication")) { return 0; }
+    if (0 != strncmp(RSTRING_PTR(authentication), "authentication", 14)) { return 0; }
+
+    return 1;
+}
+
 int is_banner_begin(LexInfo *lex) {
     VALUE banner_ary, banner;
     int token_count = RARRAY_LEN(lex->tokens);
@@ -94,6 +121,8 @@ int is_banner_begin(LexInfo *lex) {
 
     if (banner_pos < 0) { return 0; }
 
+    if (is_authentication_banner_begin(lex)) { return 1; }
+
     banner_ary = rb_ary_entry(lex->tokens, banner_pos);
     banner = TOKEN_VALUE(banner_ary);
     if (TYPE(banner) != T_STRING) { return 0; }
@@ -125,7 +154,7 @@ static void delimit(LexInfo *lex) {
     case (LEX_STATE_INTEGER):
         strncpy(string, &lex->text[lex->token_start], lex->token_length);
         string[lex->token_length] = '\0';
-        token = rb_int_new(atoi(string));
+        token = rb_int_new(atoll(string));
         break;
 
     case (LEX_STATE_DECIMAL):

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

@@ -113,7 +113,10 @@ module IOSParser
     end
 
     def banner_begin?
-      tokens[-2] && tokens[-2].value == 'banner'
+      tokens[-2] && (
+        tokens[-2].value == 'banner' ||
+        tokens[-2..-1].map(&:value) == %w[authentication banner]
+      )
     end
 
     def banner

data/lib/ios_parser/version.rb

@@ -1,7 +1,7 @@
 module IOSParser
   class << self
     def version
-      '0.6.0'
+      '0.8.0'
     end
   end
 end

data/spec/lib/ios_parser/lexer_spec.rb

@@ -137,6 +137,29 @@ END
         it { expect(subject_pure.map(&:value)).to eq output }
       end
 
+      context 'aaa authentication banner' do
+        let(:input) { <<END.unindent }
+        aaa authentication banner ^C
+        xyz
+        ^C
+        aaa blah
+END
+
+        let(:output) do
+          ['aaa', 'authentication', 'banner',
+           :BANNER_BEGIN, "xyz\n", :BANNER_END, :EOL,
+           'aaa', 'blah', :EOL]
+        end
+
+        it 'lexes (c lexer)' do
+          expect(subject.map(&:value)).to eq output
+        end
+
+        it 'lexes (ruby lexer)' do
+          expect(subject_pure.map(&:value)).to eq output
+        end
+      end
+
       context 'decimal number' do
         let(:input) { 'boson levels at 93.2' }
         let(:output) { ['boson', 'levels', 'at', 93.2] }
@@ -356,6 +379,19 @@ END
         it { expect(subject_pure.map(&:value)).to eq output }
         it { expect(subject.map(&:value)).to eq output }
       end # context 'comment at end of line' do
+
+      context 'large integers up to 2^63-1' do
+        let(:input) do
+          "42 4200000000 9223372036854775807"
+        end
+
+        let(:output) do
+          [42, 4200000000, 9223372036854775807]
+        end
+
+        it { expect(subject_pure.map(&:value)).to eq output }
+        it { expect(subject.map(&:value)).to eq output }
+      end # context 'large integers up to 2^63-1' do
     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.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Ben Miller
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-07 00:00:00.000000000 Z
+date: 2022-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -52,16 +52,16 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.54'
-description: 
+description:
 email: bjmllr@gmail.com
 executables: []
 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
@@ -95,7 +95,7 @@ homepage: https://github.com/bjmllr/ios_parser
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,16 +103,15 @@ 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: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: convert network switch and router config files to structured data
 test_files:

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