trifle 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    trifle (0.0.2)
+    trifle (0.0.3)
 
 GEM
   remote: http://rubygems.org/

data/LICENSE

@@ -0,0 +1,23 @@
+Copyright (c) 2012 EmberAds Ltd <team@emberads.com>
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/README.md

@@ -35,6 +35,18 @@ trifle.load filenames: ["file1.csv", "file2.csv"]
 trifle.load data: preloaded_array
 ```
 
+Additionally you can specify your own Redis key to store the Trifle in:
+
+```ruby
+trifle = Trifle.new(Redis.new, key: "foobar")
+```
+
+You can also load the Trifle from the command line:
+
+```
+trifle file1.csv file2.csv
+```
+
 ### Lookup
 
 ```ruby
@@ -53,8 +65,11 @@ trifle.find "192.168.1.1"
 
 ## Release notes
 
+* **0.0.3** Added a binary for loading Trifle from the command line
 * **0.0.2** Added support for custom Redis key
 * **0.0.1** First draft
 
+## License
 
+See LICENSE
 

data/bin/trifle

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+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`"
+  exit(1)
+end
+
+redis_config = {}
+trifle_options = {}
+filenames = []
+
+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
+  else
+    filenames << arg
+  end
+end
+
+redis = Redis.new redis_config
+puts "Loading #{filenames.join(", ")}"
+Trifle.new(redis, trifle_options).load(filenames: filenames)
+puts "Trifle loaded"

data/lib/trifle/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trifle
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   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: &70340253404740 !ruby/object:Gem::Requirement
+  requirement: &70355541318060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70340253404740
+  version_requirements: *70355541318060
 - !ruby/object:Gem::Dependency
   name: rujitsu
-  requirement: &70340253404100 !ruby/object:Gem::Requirement
+  requirement: &70355541317480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70340253404100
+  version_requirements: *70355541317480
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70340253403320 !ruby/object:Gem::Requirement
+  requirement: &70355541316720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70340253403320
+  version_requirements: *70355541316720
 - !ruby/object:Gem::Dependency
   name: fakeredis
-  requirement: &70340253402820 !ruby/object:Gem::Requirement
+  requirement: &70355541303720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,12 +54,13 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70340253402820
+  version_requirements: *70355541303720
 description: Stores the GeoIP databases in Redis and gives it a simple way to lookup
   IPs and map them to countries
 email:
 - cristiano@emberads.com
-executables: []
+executables:
+- trifle
 extensions: []
 extra_rdoc_files: []
 files:
@@ -67,8 +68,10 @@ files:
 - .rspec
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
+- bin/trifle
 - lib/trifle.rb
 - lib/trifle/finder.rb
 - lib/trifle/initialize_with_redis.rb