redirect_conf 0.7 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 022b8129aa9f7d9d2986a5ffe083e31817042cb5
-  data.tar.gz: fe73ab4d107a0acbfe081434d85ecf3b24155629
+  metadata.gz: 85a59a18288eeb884068ef4ad68958fe44fa81b6
+  data.tar.gz: 6a7f700853177e49f566fbbd0646ff4683934416
 SHA512:
-  metadata.gz: fb1e6944eb0ce90c98c230ad166d7d8fd7ce91e92d4d286837b28b8b4a5ed03c859c0e9ad61bde6e49962d0b6ae403a7ed6ebd932554b56840a5c6d479f55ed2
-  data.tar.gz: 1da8b2480c09a8ea0154e3965cd8ffdeaedbe05a0a381fb7816505550adbfe3dfdc7f573ed1f29efa76cbc65faa776bbfedcac2c85be6a242a9ca7e5df4256b0
+  metadata.gz: 1ffbd42c5cbe3bef268273e9e5cd63018a2db246fe6ac61da08e75234aba741de2d0d80e8c630da1632535f9b645c669c9cd6e38d95060d16aaf41ba854ec04b
+  data.tar.gz: 2df9a28cebac3ca243756586e8e121183c262483b3438228768ecb28da0d257e62688a620f86e30334ffbefa7ddc242f26dbb97f96ce7da7fabf0a561956ff64

data/bin/redirect_conf

@@ -8,38 +8,28 @@ require 'ostruct'
 
 class RedirectConfig < Thor
 
-  desc "csv_to_apache <CSVFILE",
-       <<-EOT
-Creates RewriteRules for Apache web server from given CSVFILE as complementary to apache_to_csv.
-       EOT
+  desc "csv_to_apache <CSVFILE", "Creates RewriteRules for Apache web server from given CSVFILE as complementary to apache_to_csv."
+  method_option :format, default: 'dos', aliases:'-f', enum: %w{unix dos}
   def csv_to_apache
     line_no = 0
+    row_sep = case options[:format] when 'dos' then "\r\n" else "\n" end
 
-    CSV($stdin, row_sep: "\r\n", headers: true).each do |in_row|
+    CSV($stdin, row_sep: row_sep, headers: true).each do |in_row|
       line_no += 1
 
       pattern = in_row['Pattern']
+      pattern = "^#{Regexp.escape(pattern)}$" unless boolean(in_row['re'])
       destination = in_row['Destination']
       condition = in_row['Condition']
-      r = in_row['R']
-      l = boolean in_row['L']
-      nc = boolean in_row['NC']
-      ne = boolean in_row['NE']
-      re = boolean in_row['RE']
-      qsa = boolean in_row['QSA']
-      qsd = boolean in_row['QSD']
 
       f = []
+      r = in_row['R']
       f << "r=#{r}" if r
-      f << "ne" if ne
-      f << "nc" if nc
-      f << "l" if l
-      f << "qsa" if qsa
-      f << "qsd" if qsd
+      %w{NE NC L QSA QSD}.each do |n|
+        f << n.downcase if boolean(in_row[n])
+      end
       flags = "[#{f.join(',')}]" unless f.empty?
 
-      pattern = "^#{Regexp.escape(pattern)}$" unless re
-
       puts "RewriteCond\t#{condition}" if condition
       puts "RewriteRule\t#{pattern} #{destination} #{flags}"
     end

data/redirect_conf.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "redirect_conf"
-  spec.version       = "0.7"
+  spec.version       = "0.8"
   spec.authors       = ["Peter Ehrenberg"]
   spec.email         = ["pe@dipe.de"]
 

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: redirect_conf
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
 platform: ruby
 authors:
 - Peter Ehrenberg
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: thor
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
 description: Creates Apache mod_rewrite RedirectRules from CSVFILE.
 email:
 - pe@dipe.de
@@ -60,7 +60,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -69,28 +69,28 @@ files:
 - bin/redirect_conf
 - lib/redirect_conf.rb
 - redirect_conf.gemspec
-homepage:
+homepage: 
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 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.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.6
+signing_key: 
 specification_version: 4
 summary: Creates Apache mod_rewrite RedirectRules from CSVFILE.
 test_files: []