puffy 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29faa3d9a8f47338dd25bd99d2256bc7bfa60a6790f3e39e8613a86c540bb30a
-  data.tar.gz: 345aa1d4ef63d8b7ebcb05f4892a690a81c385fb41ed3c5bc48406bd70ca2ba0
+  metadata.gz: b05f6a865607d5ece6a83d81f3ef925decf281b4fa0fc54daf7aaa2213135831
+  data.tar.gz: 9ac1891cb02cf876b0ac64fc19dc857996c1e3dfa3141e5b339c82f98603ced9
 SHA512:
-  metadata.gz: 5ccead5c447d76590049b2ac548c771bb34d548a2b51ce2b479586926c1a3c7940cce7cc5a24f7a9ac2c15d3c4398fe1fc1c0dad215bda2e3273f68c4dd14a9e
-  data.tar.gz: a18934dc97ae9d09ce7dda9b33efb9d35962db15858c234f8a85830967813d74c6049e5f74d917482085a72bb0ac5b86e122daf2d293abdc06b22df06a6f968b
+  metadata.gz: 73c1d65f67292e4e3d2452978ad21bc2bca7001cce5304472686a8a843bf742e635b11c86606f43a1af1024cb30bf63faf7f1444cc4b380ee7f589300086bb2b
+  data.tar.gz: f93e5ffc88eda099624f28ce13997dbe0a9222955eb76aa6e5e725d77be3a313da0b38ccddf3f10a550f60418cb44e39bb3724e2a02aab952c2a6b643ec7d28c

data/.github/dependabot.yml

@@ -0,0 +1,18 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  # Open PR for gem updates
+  - package-ecosystem: "bundler" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+
+  # Open PR for GitHub Actions updates
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
   rubocop:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -32,9 +32,11 @@ jobs:
           - "2.7"
           - "3.0"
           - "3.1"
+          - "3.2"
+          - "3.3"
     name: Ruby ${{ matrix.ruby }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -47,7 +49,7 @@ jobs:
         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
+        uses: paambaati/codeclimate-action@v5.0.0
         env:
           CC_TEST_REPORTER_ID: ${{ secrets.CODECLIMATE_TOKEN }}
         with:

data/.rubocop.yml

@@ -3,7 +3,7 @@ AllCops:
   AllowSymlinksInCacheRootDirectory: true
   NewCops: enable
   Exclude:
-    - lib/melt/*.tab.rb
+    - lib/puffy/*.tab.rb
     - tmp/**/*.rb
     - vendor/bundle/**/*
 

data/CHANGELOG.md

@@ -1,6 +1,35 @@
 # Changelog
 
-## [v0.2.0](https://github.com/opus-codium/puffy/tree/v0.2.0) (2022-12-17)
+## [v1.0.0](https://github.com/opus-codium/puffy/tree/v1.0.0) (2024-04-09)
+
+[Full Changelog](https://github.com/opus-codium/puffy/compare/v0.3.1...v1.0.0)
+
+**Implemented enhancements:**
+
+- Setup dependabot [\#36](https://github.com/opus-codium/puffy/pull/36) ([smortex](https://github.com/smortex))
+- Add support for Ruby 3.3 [\#33](https://github.com/opus-codium/puffy/pull/33) ([smortex](https://github.com/smortex))
+
+## [v0.3.1](https://github.com/opus-codium/puffy/tree/v0.3.1) (2023-11-22)
+
+[Full Changelog](https://github.com/opus-codium/puffy/compare/v0.3.0...v0.3.1)
+
+**Fixed bugs:**
+
+- Ensure parser is up-to-date before build [\#31](https://github.com/opus-codium/puffy/pull/31) ([smortex](https://github.com/smortex))
+
+## [v0.3.0](https://github.com/opus-codium/puffy/tree/v0.3.0) (2023-01-04)
+
+[Full Changelog](https://github.com/opus-codium/puffy/compare/v0.2.0...v0.3.0)
+
+**Implemented enhancements:**
+
+- Add support for nested variables [\#29](https://github.com/opus-codium/puffy/pull/29) ([smortex](https://github.com/smortex))
+
+**Fixed bugs:**
+
+- Fix iptables rules without direction [\#28](https://github.com/opus-codium/puffy/pull/28) ([smortex](https://github.com/smortex))
+
+## [v0.2.0](https://github.com/opus-codium/puffy/tree/v0.2.0) (2022-12-18)
 
 [Full Changelog](https://github.com/opus-codium/puffy/compare/v0.1.0...v0.2.0)
 

data/Gemfile

@@ -4,3 +4,16 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in puffy.gemspec
 gemspec
+
+gem 'aruba'
+gem 'bundler'
+gem 'cucumber'
+gem 'github_changelog_generator'
+gem 'racc'
+gem 'rake'
+gem 'rspec'
+gem 'rubocop'
+gem 'rubocop-rake'
+gem 'rubocop-rspec'
+gem 'simplecov'
+gem 'timecop'

data/Rakefile

@@ -14,7 +14,7 @@ Cucumber::Rake::Task.new(:features)
 GitHubChangelogGenerator::RakeTask.new :changelog do |config|
   config.user = 'opus-codium'
   config.project = 'puffy'
-  config.exclude_labels = ['skip-changelog']
+  config.exclude_labels = %w[dependencies skip-changelog]
   config.future_release = "v#{Puffy::VERSION}"
 end
 
@@ -22,9 +22,11 @@ task test: %i[spec features]
 
 task default: :test
 
+task build: :gen_parser
+
 desc 'Generate the puffy language parser'
 task gen_parser: 'lib/puffy/parser.tab.rb'
 
 file 'lib/puffy/parser.tab.rb' => 'lib/puffy/parser.y' do
-  `racc -S lib/puffy/parser.y`
+  `racc --embedded --frozen --output-status lib/puffy/parser.y`
 end

data/lib/core_ext.rb

@@ -59,15 +59,13 @@ end
 
 class Array # :nodoc:
   def deep_dup
-    array = []
-    each do |value|
-      array << if value.respond_to?(:deep_dup)
-                 value.deep_dup
-               else
-                 value.dup
-               end
+    map do |value|
+      if value.respond_to?(:deep_dup)
+        value.deep_dup
+      else
+        value.dup
+      end
     end
-    array
   end
 end
 

data/lib/puffy/formatters/iptables.rb

@@ -106,11 +106,19 @@ module Puffy
         end
 
         def input_filter_rules(rules)
-          rules.select { |r| r.filter? && r.in? }
+          rules.select { |r| r.filter? && r.in? }.map do |rule|
+            dup = rule.dup
+            dup.dir = :in
+            dup
+          end
         end
 
         def output_filter_rules(rules)
-          rules.select { |r| r.filter? && r.out? }
+          rules.select { |r| r.filter? && r.out? }.map do |rule|
+            dup = rule.dup
+            dup.dir = :out
+            dup
+          end
         end
       end
 

data/lib/puffy/formatters/pf.rb

@@ -116,13 +116,21 @@ module Puffy
         def emit_rdr_to(rule)
           return unless rule.rdr?
 
-          keyword = Puffy::Formatters::Base.loopback_addresses.include?(rule.rdr_to_host) ? 'divert-to' : 'rdr-to'
+          keyword = rdr_to_keyword(rule)
           destination = rule.rdr_to_host || loopback_address(rule.af)
           raise 'Unspecified address family' if destination.nil?
 
           emit_endpoint_specification(keyword, destination, rule.rdr_to_port)
         end
 
+        def rdr_to_keyword(rule)
+          if Puffy::Formatters::Base.loopback_addresses.include?(rule.rdr_to_host)
+            'divert-to'
+          else
+            'rdr-to'
+          end
+        end
+
         def emit_nat_to(rule)
           "nat-to #{emit_address(rule.nat_to)}" if rule.nat_to
         end