cisco_acl_intp 0.0.3 → 0.0.4

data/spec/cisco_acl_intp/scanner_spec.rb

@@ -14,41 +14,39 @@ ip access-list extended FA8-OUT
     deny   udp any any eq bootpc
     permit ip any any
 EOL
-      @s.scan_line(acl).should == [
-        [:NAMED_ACL, 'ip access-list'],
-        %w(extended extended),
-        [:STRING, 'FA8-OUT'],
-        [:EOS, nil],
-        %w(deny deny),
-        %w(udp udp),
-        %w(any any),
-        %w(any any),
-        %w(eq eq),
-        %w(bootpc bootpc),
-        [:EOS, nil],
-        %w(permit permit),
-        %w(ip ip),
-        %w(any any),
-        %w(any any),
-        [:EOS, nil],
-        [false, 'EOF']
-     ]
+      expect(@s.scan_line(acl)).to eq(
+        [
+          [:NAMED_ACL, 'ip access-list'],
+          %w(extended extended),
+          [:STRING, 'FA8-OUT'],
+          [:EOS, nil],
+          %w(deny deny),
+          %w(udp udp),
+          %w(any any),
+          %w(any any),
+          %w(eq eq),
+          %w(bootpc bootpc),
+          [:EOS, nil],
+          %w(permit permit),
+          %w(ip ip),
+          %w(any any),
+          %w(any any),
+          [:EOS, nil],
+          [false, 'EOF']
+        ])
     end
 
     tokens = YAML.load_file(_spec_conf_dir('single_tokens.yml'))
     tokens.each do |each|
       # run test
       it "should be parsed single token: #{each}" do
-        @s.scan_line(each).should
-        eq [
+        expect(@s.scan_line(each)).to eq [
           [each, each],
           [:EOS, nil],
-          [:EOS, nil],
           [false, 'EOF']
         ]
       end
     end
-
   end # scan_line
 
   describe '#scan_file' do
@@ -73,19 +71,18 @@ EOL
         lines.each do |each_line|
           file.puts each_line[:line]
 
+          next unless each_line[:tokens]
           # make tokens data
-          if each_line[:tokens]
-            each_line[:tokens].each do |each_token|
-              case each_token
-              when Array
-                (symbstr, val) = each_token
-                tokens.push [symbstr.intern, val] # symbolize
-              when String
-                tokens.push [each_token, each_token]
-              end
+          each_line[:tokens].each do |each_token|
+            case each_token
+            when Array
+              (symbstr, val) = each_token
+              tokens.push [symbstr.intern, val] # symbolize
+            when String
+              tokens.push [each_token, each_token]
             end
-            tokens.push [:EOS, nil] # End of String
           end
+          tokens.push [:EOS, nil] # End of String
         end
         tokens.push [false, 'EOF'] # last token (End of File)
       end
@@ -106,13 +103,11 @@ EOL
 #{each_test[:test_description]}" do
         tokens = YAML.load_file(token_file)
         File.open(acl_file) do |file|
-          @s.scan_file(file).should eq tokens
+          expect(@s.scan_file(file)).to eq tokens
         end
       end
     end # tests.each
-
   end # scan_file
-
 end # describe Scanner
 
 ### Local variables:

data/spec/parser_fullfill_patterns.rb

@@ -7,7 +7,7 @@ TOKEN_SEQ_FILE_LIST = [
   'stdacl_token_seq.yml',
   'extacl_token_seq.yml',
   # 'extacl_objgrp_token_seq.yml'
-]
+].freeze
 
 # return spec conf dir
 def _spec_conf_dir(file)
@@ -34,13 +34,12 @@ def gen_testcase(tokens, fields)
 end
 
 def create_data(field_patterns, leftover_results)
-  field_patterns.reduce([]) do |curr_results, each|
+  field_patterns.each_with_object([]) do |each, curr_results|
     leftover_results.each do |each_res|
       ## do not add pattern that has multiple 'false'
       ## add single fault pattern.
-      if each[:valid] || each_res[:valid]
-        curr_results.push(single_data(each, each_res))
-      end
+      next unless each[:valid] || each_res[:valid]
+      curr_results.push(single_data(each, each_res))
     end
     curr_results
   end
@@ -126,7 +125,7 @@ describe 'Parser' do
     it 'should be parsed acl [<%= now %>]: <%= t[:data] %>' do
       datastr = '<%= t[:data] %>'
       @parser.parse_string(datastr)
-      @parser.contains_error?.should be_false
+      expect(@parser.contains_error?).to be_falsey
     end
 <%-
     else
@@ -134,7 +133,7 @@ describe 'Parser' do
     it 'should not be parsed acl [<%= now %>]: <%= t[:data] %>' do
       datastr = StringIO.new('<%= t[:data] %>', 'r')
       @parser.parse_file(datastr)
-      @parser.contains_error?.should be_true
+      expect(@parser.contains_error?).to be_truthy
     end
 <%-
     end

data/spec/spec_helper.rb

@@ -15,10 +15,10 @@ end
 require 'cisco_acl_intp'
 
 include CiscoAclIntp
-AclContainerBase.disable_color
+AccessControlContainer.disable_color
 
-RSpec::Matchers.define :be_aclstr do | expected_str |
-  match do | actual_str |
+RSpec::Matchers.define :be_aclstr do |expected_str|
+  match do |actual_str|
     a = actual_str.strip
     b = expected_str.strip
     a.split(/\s+/) == b.split(/[\s\r\n]+/)
@@ -30,12 +30,12 @@ end
 # hash to hash-code-string
 def _pph(hash)
   kv = []
-  hash.each do | k, v |
+  hash.each do |k, v|
     case v
     when String
-      kv.push %Q(:#{k}=>"#{v}")
+      kv.push %(:#{k}=>"#{v}")
     else
-      kv.push %Q(:#{k}=>#{v})
+      kv.push %(:#{k}=>#{v})
     end
   end
   kv.join(',')

data/tools/check_acl.rb

@@ -6,7 +6,7 @@ require 'optparse'
 require 'cisco_acl_intp'
 
 opts = {}
-OptionParser.new do | each |
+OptionParser.new do |each|
   each.banner = "ruby #{$PROGRAM_NAME} [options] [args]"
   each.on('-c MODE', '--color', 'enable coloring (MODE=[term, html]') do |x|
     opts[:color] = x.intern

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: cisco_acl_intp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - stereocat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2016-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.1l.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.1l.2
 description: Cisco ACL Interpreter
 email:
 - stereocat@gmail.com
@@ -59,12 +59,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
-- .yardopts
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -75,45 +75,46 @@ files:
 - acl_examples/numd-acl.txt
 - cisco_acl_intp.gemspec
 - lib/cisco_acl_intp.rb
-- lib/cisco_acl_intp/ace.rb
-- lib/cisco_acl_intp/ace_ip.rb
-- lib/cisco_acl_intp/ace_other_qualifiers.rb
-- lib/cisco_acl_intp/ace_port.rb
-- lib/cisco_acl_intp/ace_port_opr.rb
-- lib/cisco_acl_intp/ace_port_opr_base.rb
-- lib/cisco_acl_intp/ace_proto.rb
-- lib/cisco_acl_intp/ace_proto_base.rb
-- lib/cisco_acl_intp/ace_srcdst.rb
-- lib/cisco_acl_intp/ace_tcp_flags.rb
+- lib/cisco_acl_intp/acc.rb
+- lib/cisco_acl_intp/ace_base.rb
+- lib/cisco_acl_intp/ace_extended.rb
+- lib/cisco_acl_intp/ace_standard.rb
+- lib/cisco_acl_intp/acespec_base.rb
+- lib/cisco_acl_intp/acespec_ip.rb
+- lib/cisco_acl_intp/acespec_other_qualifiers.rb
+- lib/cisco_acl_intp/acespec_port.rb
+- lib/cisco_acl_intp/acespec_port_opr.rb
+- lib/cisco_acl_intp/acespec_port_opr_base.rb
+- lib/cisco_acl_intp/acespec_proto.rb
+- lib/cisco_acl_intp/acespec_proto_base.rb
+- lib/cisco_acl_intp/acespec_srcdst.rb
+- lib/cisco_acl_intp/acespec_tcp_flags.rb
 - lib/cisco_acl_intp/acl.rb
 - lib/cisco_acl_intp/acl_base.rb
+- lib/cisco_acl_intp/acl_category_base.rb
 - lib/cisco_acl_intp/acl_utils.rb
-- lib/cisco_acl_intp/extended_ace.rb
-- lib/cisco_acl_intp/mono_function_acl.rb
 - lib/cisco_acl_intp/parser.rb
 - lib/cisco_acl_intp/parser.ry
 - lib/cisco_acl_intp/parser_api.rb
 - lib/cisco_acl_intp/scanner.rb
 - lib/cisco_acl_intp/scanner_special_token_handler.rb
-- lib/cisco_acl_intp/single_acl_base.rb
-- lib/cisco_acl_intp/standard_ace.rb
 - lib/cisco_acl_intp/version.rb
-- spec/cisco_acl_intp/ace_ip_spec.rb
-- spec/cisco_acl_intp/ace_other_qualifier_spec.rb
-- spec/cisco_acl_intp/ace_port_operator_spec.rb
-- spec/cisco_acl_intp/ace_port_spec.rb
-- spec/cisco_acl_intp/ace_proto_spec.rb
+- spec/cisco_acl_intp/ace_extended_spec.rb
 - spec/cisco_acl_intp/ace_spec.rb
-- spec/cisco_acl_intp/ace_srcdst_spec.rb
-- spec/cisco_acl_intp/ace_tcp_flags_spec.rb
+- spec/cisco_acl_intp/ace_standard_spec.rb
+- spec/cisco_acl_intp/acespec_ip_spec.rb
+- spec/cisco_acl_intp/acespec_other_qualifier_spec.rb
+- spec/cisco_acl_intp/acespec_port_operator_spec.rb
+- spec/cisco_acl_intp/acespec_port_spec.rb
+- spec/cisco_acl_intp/acespec_proto_spec.rb
+- spec/cisco_acl_intp/acespec_srcdst_spec.rb
+- spec/cisco_acl_intp/acespec_tcp_flags_spec.rb
 - spec/cisco_acl_intp/acl_base_spec.rb
+- spec/cisco_acl_intp/acl_extended_spec.rb
+- spec/cisco_acl_intp/acl_standard_spec.rb
 - spec/cisco_acl_intp/cisco_acl_intp_spec.rb
-- spec/cisco_acl_intp/extended_ace_spec.rb
-- spec/cisco_acl_intp/extended_acl_spec.rb
 - spec/cisco_acl_intp/parser_spec.rb
 - spec/cisco_acl_intp/scanner_spec.rb
-- spec/cisco_acl_intp/standard_ace_spec.rb
-- spec/cisco_acl_intp/standard_acl_spec.rb
 - spec/conf/extacl_objgrp_token_seq.yml
 - spec/conf/extacl_token_seq.yml
 - spec/conf/extended_acl.yml
@@ -135,37 +136,37 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Cisco IOS Access Control List Interpreter
 test_files:
-- spec/cisco_acl_intp/ace_ip_spec.rb
-- spec/cisco_acl_intp/ace_other_qualifier_spec.rb
-- spec/cisco_acl_intp/ace_port_operator_spec.rb
-- spec/cisco_acl_intp/ace_port_spec.rb
-- spec/cisco_acl_intp/ace_proto_spec.rb
+- spec/cisco_acl_intp/ace_extended_spec.rb
 - spec/cisco_acl_intp/ace_spec.rb
-- spec/cisco_acl_intp/ace_srcdst_spec.rb
-- spec/cisco_acl_intp/ace_tcp_flags_spec.rb
+- spec/cisco_acl_intp/ace_standard_spec.rb
+- spec/cisco_acl_intp/acespec_ip_spec.rb
+- spec/cisco_acl_intp/acespec_other_qualifier_spec.rb
+- spec/cisco_acl_intp/acespec_port_operator_spec.rb
+- spec/cisco_acl_intp/acespec_port_spec.rb
+- spec/cisco_acl_intp/acespec_proto_spec.rb
+- spec/cisco_acl_intp/acespec_srcdst_spec.rb
+- spec/cisco_acl_intp/acespec_tcp_flags_spec.rb
 - spec/cisco_acl_intp/acl_base_spec.rb
+- spec/cisco_acl_intp/acl_extended_spec.rb
+- spec/cisco_acl_intp/acl_standard_spec.rb
 - spec/cisco_acl_intp/cisco_acl_intp_spec.rb
-- spec/cisco_acl_intp/extended_ace_spec.rb
-- spec/cisco_acl_intp/extended_acl_spec.rb
 - spec/cisco_acl_intp/parser_spec.rb
 - spec/cisco_acl_intp/scanner_spec.rb
-- spec/cisco_acl_intp/standard_ace_spec.rb
-- spec/cisco_acl_intp/standard_acl_spec.rb
 - spec/conf/extacl_objgrp_token_seq.yml
 - spec/conf/extacl_token_seq.yml
 - spec/conf/extended_acl.yml

data/lib/cisco_acl_intp/single_acl_base.rb

@@ -1,137 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'forwardable'
-require 'cisco_acl_intp/extended_ace'
-require 'cisco_acl_intp/acl_utils'
-
-module CiscoAclIntp
-  # Single access-list container base
-  class SingleAclBase < AclContainerBase
-    extend Forwardable
-    include Enumerable
-    include AceSearchUtility
-
-    # @return [String] name ACL name,
-    #   when numbered acl, /\d+/ string
-    attr_reader :name
-    # Some Enumerable included methods returns Array of ACE objects
-    # (e.g. sort),the returned Array was used as ACE object by
-    # overwrite accessor 'list'.
-    # @return [Array<AceBase>] list ACE object Array
-    attr_accessor :list
-    # @return [String, Symbol] acl_type ACL type
-    attr_reader :acl_type
-    # @return [String, Symbol] name_type ACL name type
-    attr_reader :name_type
-
-    def_delegators :@list, :each # for Enumerable
-    def_delegators :@list, :push, :pop, :shift, :unshift
-    def_delegators :@list, :size, :length
-
-    # Increment number of ACL sequence number
-    SEQ_NUM_DIV = 10
-
-    # Constructor
-    # @param [String] name ACL name
-    # @return [SingleAclBase]
-    def initialize(name)
-      @name = name
-      @list = []
-      @seq_number = 0
-
-      @acl_type = nil # :standard or :extended
-      @name_type = nil # :named or :numbered
-    end
-
-    # duplicate ACE list
-    # @param [Array<AceBase>] list List of ACE
-    # @return [SingleAclBase]
-    def dup_with_list(list)
-      acl = dup
-      acl.list = list.dup
-      acl
-    end
-
-    # Add ACE to ACL (push with sequence number)
-    # @param [AceBase] ace ACE object
-    def add_entry(ace)
-      # 'ace' is AceBase Object
-      # it will be ExtendedAce/StandardAce/RemarkAce/EvaluateAce
-      ace.seq_number? ||
-        ace.seq_number = (@list.length + 1) * SEQ_NUM_DIV
-      @list.push ace
-    end
-
-    # Renumber ACL by list sequence
-    def renumber
-      # re-numbering seq_number of each entry
-      @list.reduce(SEQ_NUM_DIV) do |number, each|
-        each.seq_number = number
-        number + SEQ_NUM_DIV
-      end
-    end
-
-    # Check equality
-    # @return [Boolean]
-    def ==(other)
-      if @acl_type &&
-          @name_type &&
-          @acl_type == other.acl_type &&
-          @name_type == other.name_type
-        @list == other.list
-      end
-    end
-
-    # Find lists of ACEs that contains flow by options
-    # @param [Hash] opts Options (target packet info)
-    #   options are same as #find_aces_with
-    # @see #find_aces_with
-    # @return [Array<AceBase>] List of ACEs or nil(not found)
-    def find_aces_contains(opts)
-      find_aces_with(opts) { |ace, target_ace| ace.contains?(target_ace) }
-    end
-
-    # Find lists of ACEs that is contained flow by options
-    # @param [Hash] opts Options (target packet info)
-    #   options are same as #find_aces_with
-    # @see #find_aces_with
-    # @return [Array<AceBase>] List of ACEs or nil(not found)
-    def find_aces_contained(opts)
-      find_aces_with(opts) { |ace, target_ace| target_ace.contains?(ace) }
-    end
-
-    # Find lists of ACEs
-    # @note In Standard ACL, only src_ip option is used and another
-    #   conditions are ignored (if specified).
-    # @param [Hash] opts Options (target flow info),
-    # @option opts [Integer,String] protocol L3 protocol No./Name
-    # @option opts [String] src_ip Source IP Address
-    # @option opts [String] src_operator Source port operator.
-    # @option opts [Integer,String] src_begin_port Source Port No./Name
-    # @option opts [Integer,String] src_end_port Source Port No./Name
-    # @option opts [String] dst_ip Destination IP Address
-    # @option opts [Integer,String] dst_begin_port Destination Port No./Name
-    # @option opts [Integer,String] dst_end_port Destination Port No./Name
-    # @yield Find lists of ACEs
-    # @yieldparam [ExtendedAce] ace ACE
-    # @yieldparam [ExtendedAce] target_ace Target ACE
-    # @yieldreturn [Boolean] Condition to find
-    # @return [Array<AceBase>] List of ACEs or nil(not found)
-    def find_aces_with(opts)
-      target_ace = target_ace(opts)
-      @list.find { |ace| yield(ace, target_ace) }
-    end
-
-    # acl string clean-up (override)
-    # @param [String] str ACL string.
-    # @return [String]
-    def clean_acl_string(str)
-      str =~ /remark/ ? str : super
-    end
-  end
-end # module
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End: