websolr-rails 2.1.3 → 2.2.0

data/VERSION

@@ -1 +1 @@
-2.1.3
+2.2.0

data/bin/websolr

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + "/../lib/plain_option_parser"
+require "rubygems"
+require "restclient"
+
+HOST = "www.websolr.com"
+
+PWD = File.expand_path(".")
+controller = PlainOptionParser.new(ARGV) do
+  def die(s)
+    STDERR.puts(s.strip)
+    exit(1)
+  end
+  
+  def init_heroku
+    puts "Getting username and password from Heroku config ... "
+    cfg = `heroku config`
+    @user = cfg[/WEBSOLR_USER\s*=>\s*(\S+)/, 1]
+    @pass = cfg[/WEBSOLR_PWD\s*=>\s*(\S+)/, 1]
+    unless @user && @pass
+      die <<-STR
+Cannot retrieve username and password.  Are you inside a Heroku app folder 
+with the Websolr addon enabled?
+      STR
+    end
+    @url = "http://#{@user}:#{@pass}@#{HOST}/users/default_slice_client"
+  end
+  
+  desc "shows your heroku-created index"
+  cmd "heroku show client" do
+    init_heroku
+    puts RestClient.get(@url)
+  end
+  
+  desc "sets the client to use"
+  cmd "heroku set client", "[sunspot|acts_as_solr]" do |client|
+    init_heroku
+    puts RestClient.post(@url, :client => client)
+  end
+end.start

data/lib/plain_option_parser.rb

@@ -0,0 +1,80 @@
+class PlainOptionParser
+  def initialize(args, &block)
+    @commands = []
+    desc "Prints help text for your command"
+    cmd "help" do
+      viable, remaining = commands_for_args(args[1, args.length])
+      if viable.length == 0
+        no_match
+      else
+        pretty_print viable
+      end
+    end
+    @args = args
+    instance_eval(&block)
+  end
+
+  def start
+    viable, remaining = commands_for_args(@args)
+    if viable.length == 1
+      viable[0].last.call(*remaining)
+      exit 0
+    elsif viable.length == 0
+      no_match
+    else
+      usage
+      pretty_print viable
+    end
+  end
+  
+  def desc(string)
+    @desc = string
+  end
+    
+  def cmd(name, additional = "", &block)
+    @commands << [name.split(/\s+/), @desc, additional, block]
+    @desc = nil
+  end
+  
+  def pretty_print(cmds)
+    mapped = cmds.map do |cmd|
+      name, desc, additional, block = cmd
+      ["  #{File.basename($0)} " + name.join(" ") + " #{additional}", " -- #{desc}"]
+    end
+    max = mapped.inject(0) do |memo, entry|
+      memo > entry.first.length ? memo : entry.first.length
+    end
+    mapped.each do |entry|
+      puts entry.first + (" " * (max - entry.first.length)) + entry.last
+    end
+  end
+  
+private
+  
+  def usage
+    puts "Usage: #{$0} COMMANDS"
+    puts 
+    puts "COMMANDS: "
+  end
+  
+  def commands_for_args(args)
+    viable = @commands.dup
+    args.each_with_index do |arg, i|
+      @commands.each do |cmd|
+        name, desc, additional, block = cmd
+        viable.delete(cmd) if name[i] != arg
+      end
+      if viable.length == 1
+        return [viable, args[viable[0][0].length, @args.length]]
+      end
+    end
+    return [viable, []]
+  end
+  
+  def no_match
+    puts "No matching command found."
+    puts 
+    usage
+    pretty_print @commands
+  end
+end

data/websolr-rails.gemspec

@@ -5,13 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{websolr-rails}
-  s.version = "2.1.3"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]
-  s.date = %q{2009-10-17}
+  s.date = %q{2009-10-20}
+  s.default_executable = %q{websolr}
   s.description = %q{Makes Sunspot and acts_as_solr play with WebSolr}
   s.email = %q{kyle@kylemaxwell.com}
+  s.executables = ["websolr"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -23,6 +25,8 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "bin/websolr",
+     "lib/plain_option_parser.rb",
      "lib/websolr-rails.rb",
      "lib/websolr.rb",
      "websolr-rails.gemspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: websolr-rails
 version: !ruby/object:Gem::Version 
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -9,14 +9,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-17 00:00:00 -07:00
-default_executable: 
+date: 2009-10-20 00:00:00 -07:00
+default_executable: websolr
 dependencies: []
 
 description: Makes Sunspot and acts_as_solr play with WebSolr
 email: kyle@kylemaxwell.com
-executables: []
-
+executables: 
+- websolr
 extensions: []
 
 extra_rdoc_files: 
@@ -29,6 +29,8 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/websolr
+- lib/plain_option_parser.rb
 - lib/websolr-rails.rb
 - lib/websolr.rb
 - websolr-rails.gemspec