gfwlist2ipset 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec3da723af1f59cb914ccb38d3f2af34ce676af5
-  data.tar.gz: 627f9ac7ea9d24b522df3eb56a63ee0b67a47f80
+  metadata.gz: 58cc997f476e71ad84a6cd1d1b268195d587f346
+  data.tar.gz: 78c1593784e47bdd4e1e68c455b58c75f0dcb965
 SHA512:
-  metadata.gz: 37c9b55d69ac549e56a3e711c959ab146cc5613e39074b07e3eb243b257b64f33f101c7fd0126ba5336f4b997d1c5f2912053d40a18141df3328b8e56ad13807
-  data.tar.gz: 5b30ae6602d573d74cee1969202f033b0ff670eeeb6f2d2e92883c413902fb5a737ea7e865edf7b5df450d1830a4e02ad999bf2199822bd532b6d59342c05d43
+  metadata.gz: 21bb6a67e5fe18eb5f28ae2a216d8931fa05ec907d1907464d6febe0c2fd0792da88af95a0a210bcfa1bc9534a338f5c3fb398eb0285b8cdb432dd63b2fccae0
+  data.tar.gz: a8f93340ec6eb6ba2b3fb32975bf825870ce7330e4918cf3808da5b34163fd55349475964b485cbf80d63fc05c296f0b0d7aa635e9ba430853db0b9960725a2f

data/bin/gfwlist2ipset

@@ -8,14 +8,20 @@ options = {}
 OptionParser.new do |opts|
   opts.banner = "Usage: gfwlist2ipset [options]"
 
-  opts.on('-d <DNS Server>', '--dns <DNS Server>', 'Set a DNS Server') do |value|
-    options[:dns] = value
+  options[:ipset] = 'outwall'
+  options[:output] = 'gfwlist.conf'
+
+  opts.on('', '--ipset <ipset name>', 'Specify ipset name, default: outwall') do |value|
+    options[:ipset] = value
   end
 
-  options[:output] = 'gfwlist.conf'
   opts.on('-o OUTPUT', '--output OUTPUT', 'Output file, default: gfwlist.conf') do |value|
     options[:output] = value
   end
+
+  opts.on('-d <DNS Server>', '--dns <DNS Server>', 'Specify DNS Server') do |value|
+    options[:dns] = value
+  end
 end.parse!
 
 gfwlist_url = 'https://autoproxy-gfwlist.googlecode.com/svn/trunk/gfwlist.txt'
@@ -107,11 +113,11 @@ File.open(options[:output], 'w+') do |f|
   if options.has_key?(:dns)
     domains.sort.uniq.each do |domain|
       f.puts('server=/' + domain + '/' + options[:dns])
-      f.puts('ipset=/' + domain + '/outwall')
+      f.puts('ipset=/' + domain + '/' + options[:ipset])
     end
   else
     domains.sort.uniq.each do |domain|
-      f.puts('ipset=/' + domain + '/outwall')
+      f.puts('ipset=/' + domain + '/' + options[:ipset])
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gfwlist2ipset
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nullizer