shutter 0.2.0 → 0.2.2

data/.gitignore

@@ -4,6 +4,7 @@
 .config
 .yardoc
 .rvmrc
+.ruby-version
 Gemfile.lock
 InstalledFiles
 _yardoc
@@ -16,3 +17,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+vendor

data/README.md

@@ -14,11 +14,9 @@ Instalation is through the gem package management program.
 
     $ gem install shutter
 
-## Upgrading from <= 0.0.7 to 0.1.0
+## Upgrading from older versions
 
-Version 0.0.7 added forwarding capabilities to shutter so the base.ipt changed and needs to be upgraded.  Version 0.1.0 was a complete rewrite which fixed multiple
-bugs as well as the problem with the maximum prefix length for iptables logging in base.ipt.  Support for ubuntu and debian was added but not tested well and 
-requires the iptables-persistant package.  To upgrade the base template and add the new configuration files, use the following command:
+The base template will sometimes change with new versions to correct errors and add features.  To upgrade the base template and add any new configuration files that the new version may require, use the following command:
 
     $ shutter --upgrade
 
@@ -74,7 +72,7 @@ persist file if it is in a non-standard location.
 
     $ shutter --check
 
-The command will generate 'OK' if the rules and chains match and 'MISMATCH' if there is any variance.
+The command will return 'OK' if the rules and chains match and 'MISMATCH' if there is any variance.
 
 #### Command line options
     Usage: shutter [options]

data/lib/shutter/iptables.rb

@@ -48,7 +48,9 @@ module Shutter
 
       def clean
         @base = @base.gsub(/^#.*$/, "")
-        @base = @base.gsub(/^$\n/, "") 
+        @base = @base.gsub(/^$\n/, "")
+        # Add a newline at the end
+        @base + "\n"
       end
 
       def read(file, filter=true)
@@ -231,7 +233,7 @@ module Shutter
         filtered = content.scan(/^[:-].*$/).sort
         # Make sure that we remove (gsub) the counts on the chains and remove any
         # trailing whitespace and newlines
-        filtered.map {|x| x.gsub(/\ \[.*\]/,"").strip}
+        filtered.map {|x| x.gsub(/\ \[.*\]/,"").split(' ').sort.join.strip}
       end
 
     end

data/lib/shutter/version.rb

@@ -1,3 +1,3 @@
 module Shutter
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/spec/iptables_spec.rb

@@ -164,6 +164,7 @@ COMMIT
 :OUTPUT ACCEPT [0:0]
 -A POSTROUTING -o eth1 -j MASQUERADE
 -A POSTROUTING -o eth2 -j MASQUERADE
-COMMIT}
+COMMIT
+}
   end
 end

metadata

@@ -1,88 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shutter
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.2.2
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Rob Lyon
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+date: 2013-06-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: mocha
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: simplecov
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id004
-description: "Shutter is a tool that gives system administrators the ability \n                         to manage iptables firewall settings through simple lists instead \n                         of complex iptables rules. Please note:  This application is currently \n                         only tested with Red Hat based distributions.  Ubuntu and Debian should \n                         work but are not supported..\n                        "
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! "Shutter is a tool that gives system administrators the ability \n
+  \                        to manage iptables firewall settings through simple lists
+  instead \n                         of complex iptables rules. Please note:  This
+  application is currently \n                         only tested with Red Hat based
+  distributions.  Ubuntu and Debian should \n                         work but are
+  not supported..\n                        "
+email:
 - nosignsoflifehere@gmail.com
-executables: 
+executables:
 - shutter
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -115,40 +120,31 @@ files:
 - spec/iptables_spec.rb
 - spec/os_spec.rb
 - spec/spec_helper.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Shutter helps manage iptables firewalls
-test_files: 
+test_files:
 - spec/command_line_spec.rb
 - spec/content_spec.rb
 - spec/files/base.ipt