websolr-rails 2.3.3 → 2.4.0

data/CHANGELOG

@@ -1,3 +1,5 @@
+2.4.0
+- added the --app option for heroku users
 2.3.3
 - added a CHANGELOG
-- Fixed "master_session" bug with Sunspot
+- Fixed "master_session" bug with Sunspot (via notch8)

data/Rakefile

@@ -36,9 +36,21 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :spec => :check_dependencies
 
-task :default => :test
+task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-2.3.3
+2.4.0

data/bin/websolr

@@ -6,7 +6,7 @@ require "restclient"
 HOST = "www.websolr.com"
 
 PWD = File.expand_path(".")
-controller = PlainOptionParser.new(ARGV) do
+controller = PlainOptionParser.new do
   def die(s)
     STDERR.puts(s.strip)
     exit(1)
@@ -14,7 +14,8 @@ controller = PlainOptionParser.new(ARGV) do
   
   def init_heroku
     puts "Getting username and password from Heroku config ... "
-    cfg = `heroku config`
+    app = flags["app"] ? "--app=#{flags["app"]}" : ""
+    cfg = `heroku config #{app}`
     @user = cfg[/WEBSOLR_USER\s*=>\s*(\S+)/, 1]
     @pass = cfg[/WEBSOLR_PWD\s*=>\s*(\S+)/, 1]
     unless @user && @pass
@@ -37,4 +38,4 @@ with the Websolr addon enabled?
     init_heroku
     puts RestClient.post(@url, :client => client)
   end
-end.start
+end.start(ARGV)

data/lib/plain_option_parser.rb

@@ -1,5 +1,7 @@
 class PlainOptionParser
-  def initialize(args, &block)
+  attr_reader :flags
+  
+  def initialize(&block)
     @commands = []
     desc "Prints help text for your command"
     cmd "help" do
@@ -10,15 +12,13 @@ class PlainOptionParser
         pretty_print viable
       end
     end
-    @args = args
     instance_eval(&block)
   end
 
-  def start
-    viable, remaining = commands_for_args(@args)
+  def start(args)
+    viable, remaining = commands_for_args(args)
     if viable.length == 1
       viable[0].last.call(*remaining)
-      exit 0
     elsif viable.length == 0
       no_match
     else
@@ -55,7 +55,29 @@ private
     puts "COMMANDS: "
   end
   
+  
+  KV_FLAG = /--(.*)=(.*)/
+  K_FLAG  =  /--(.*)/
+  def strip_flags(args)
+    @flags ||= {}
+    @prev = nil
+    args.map do |arg|
+      if arg =~ KV_FLAG
+        @flags[$1] = $2
+        nil
+      elsif @prev            
+        @flags[@prev] = arg
+        @prev = nil
+      elsif @prev = arg[K_FLAG, 1]
+        nil
+      else
+        arg
+      end
+    end.compact
+  end
+  
   def commands_for_args(args)
+    args = strip_flags(args)
     viable = @commands.dup
     args.each_with_index do |arg, i|
       @commands.each do |cmd|
@@ -63,7 +85,7 @@ private
         viable.delete(cmd) if name[i] != arg
       end
       if viable.length == 1
-        return [viable, args[viable[0][0].length, @args.length]]
+        return [viable, args[viable[0][0].length, args.length]]
       end
     end
     return [viable, []]

data/spec/plain_option_parser_spec.rb

@@ -0,0 +1,31 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+$pop = PlainOptionParser.new do
+  desc "set abc"
+  cmd "test set abc" do |value|
+    $abc = value
+    $abc += flags["app"] if flags["app"]
+  end
+  
+  desc "unset abc"
+  cmd "test unset abc" do |client|
+    $abc = false
+  end
+end
+
+describe "PlainOptionParser" do
+  it "should set abc" do
+    $pop.start %w[test set abc 123]
+    $abc.should == "123"
+  end
+  
+  it "should unset abc" do
+    $pop.start %w[test unset abc]
+    $abc.should be_false
+  end
+  
+  it "should take a flag" do
+    $pop.start %w[test set abc 123 --app foo]
+    $abc.should == "123foo"
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'plain_option_parser'
+require 'spec'
+require 'spec/autorun'
+
+Spec::Runner.configure do |config|
+  
+end

data/websolr-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{websolr-rails}
-  s.version = "2.3.3"
+  s.version = "2.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]
-  s.date = %q{2009-12-15}
+  s.date = %q{2010-01-06}
   s.default_executable = %q{websolr}
   s.description = %q{Makes Sunspot and acts_as_solr play with WebSolr}
   s.email = %q{kyle@kylemaxwell.com}
@@ -30,6 +30,8 @@ Gem::Specification.new do |s|
      "lib/plain_option_parser.rb",
      "lib/websolr-rails.rb",
      "lib/websolr.rb",
+     "spec/plain_option_parser_spec.rb",
+     "spec/spec_helper.rb",
      "websolr-rails.gemspec"
   ]
   s.homepage = %q{http://github.com/onemorecloud/websolr-rails}
@@ -37,6 +39,10 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{WebSolr adapter}
+  s.test_files = [
+    "spec/plain_option_parser_spec.rb",
+     "spec/spec_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: websolr-rails
 version: !ruby/object:Gem::Version 
-  version: 2.3.3
+  version: 2.4.0
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-15 00:00:00 -08:00
+date: 2010-01-06 00:00:00 -08:00
 default_executable: websolr
 dependencies: []
 
@@ -34,6 +34,8 @@ files:
 - lib/plain_option_parser.rb
 - lib/websolr-rails.rb
 - lib/websolr.rb
+- spec/plain_option_parser_spec.rb
+- spec/spec_helper.rb
 - websolr-rails.gemspec
 has_rdoc: true
 homepage: http://github.com/onemorecloud/websolr-rails
@@ -63,5 +65,6 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: WebSolr adapter
-test_files: []
-
+test_files: 
+- spec/plain_option_parser_spec.rb
+- spec/spec_helper.rb