trifle 0.0.3 → 0.0.4

data/bin/trifle

@@ -2,36 +2,30 @@
 require "redis"
 require "trifle"
 
-if ARGV.count < 1
-  puts "Syntax: `trifle options filenames"
-  puts "e.g. `trifle --host:127.0.0.1 --port:6380 filename1 filename2"
-  puts "Options include the usual Redis options (--scheme, --host, --port, etc)"
-  puts "and an extra option to override the `--key`"
+if ARGV.count < 2
+  puts "Syntax: `trifle redis filenames --key=your_key"
+  puts "e.g. `trifle redis://127.0.0.1:6379/6 filename1 filename2 --key=my_key"
   exit(1)
 end
 
-redis_config = {}
-trifle_options = {}
+redis = Redis.new(url: ARGV[0])
+ARGV.shift
+
 filenames = []
+options = {}
 
 ARGV.each do |arg|
   if arg.match(/^--/)
-    vals = arg.split(":")
-    key = vals.first.gsub("--", "")
-    vals.pop
-    value = vals.join(":")
-
-    if key == "key"
-      trifle_options[key] = value
-    else
-      redis_config[key] = value
-    end
+    option = arg.split("=")
+    key = option[0].gsub("--")
+    option.shift
+    value = option.join("=")
+    options[key] = value
   else
     filenames << arg
   end
 end
 
-redis = Redis.new redis_config
 puts "Loading #{filenames.join(", ")}"
-Trifle.new(redis, trifle_options).load(filenames: filenames)
+Trifle.new(redis, options).load(filenames: filenames)
 puts "Trifle loaded"

data/lib/trifle/version.rb

@@ -1,3 +1,3 @@
 class Trifle
-  VERSION = "0.0.3" unless defined? Trifle::VERSION
+  VERSION = "0.0.4" unless defined? Trifle::VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trifle
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70355541318060 !ruby/object:Gem::Requirement
+  requirement: &70309726715860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355541318060
+  version_requirements: *70309726715860
 - !ruby/object:Gem::Dependency
   name: rujitsu
-  requirement: &70355541317480 !ruby/object:Gem::Requirement
+  requirement: &70309726715260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355541317480
+  version_requirements: *70309726715260
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70355541316720 !ruby/object:Gem::Requirement
+  requirement: &70309726714540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355541316720
+  version_requirements: *70309726714540
 - !ruby/object:Gem::Dependency
   name: fakeredis
-  requirement: &70355541303720 !ruby/object:Gem::Requirement
+  requirement: &70309726713980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70355541303720
+  version_requirements: *70309726713980
 description: Stores the GeoIP databases in Redis and gives it a simple way to lookup
   IPs and map them to countries
 email: