lipsum-api 0.4 → 0.5

data/Rakefile

@@ -3,5 +3,5 @@ require 'bundler/setup'
 task :default => [:test]
 
 task :test do
-  ruby ' -Ctest -I../lib/ lipsum_test.rb'  
+  ruby ' -Ctest -I../lib/ lipsum_test.rb'
 end

data/bin/lipsum

@@ -1,34 +1,7 @@
 #!/usr/bin/env ruby
-#
-# Usage:  $ lipsum words 5
-#         $ lipsum paragraphs 5
-#         $ lipsum lists 10
-#         $ lipsum bytes 120
-#         $ lipsum w|p|l|b number
-#
-require 'rubygems'
-require 'lipsum'
-
-def print_usage
-  STDERR.puts "Usage: "
-  STDERR.puts "lipsum what amount"
-  STDERR.puts " Where 'what' can be 'words', 'paragraphs', 'lists', or 'bytes'"
-  STDOUT.puts " 'amount' is the number of words, paragraphs, lists or bytes to retrieve"
-  puts ARGV.inspect
-  exit(1)
-end
-
+# -*- mode: ruby -*-
 
-print_usage if ARGV.size < 2
-
-                
-command = ARGV[0]
-amount = ARGV[1].to_i
-start_with_lorem = ARGV.include?('--start-with-lorem') || ARGV.include?('-s')
-
-if  !['words', 'paragraphs', 'lists', 'bytes'].include?(command)
-  print_usage
-end
+require 'rubygems'
+require 'lipsum_app'
 
-opts = start_with_lorem ? {:start_with_lorem => true} : {}
-STDOUT.puts amount.send("lipsum_#{command}", opts)
+LipsumApp.start(ARGV, :debug => true)

data/lib/lipsum.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'nokogiri'
 require 'rest-client'
 

data/lib/lipsum_app.rb

@@ -0,0 +1,47 @@
+require 'thor'
+require 'lipsum'
+
+class LipsumApp < Thor
+  map 'p' => :paragraphs
+  map 'w' => :words
+  map 'l' => :lists
+  map 'b' => :bytes
+
+  desc "paragraphs AMOUNT", "Downloads an AMOUNT of paragraphs from Lipsum.com"
+  method_options  :start_with_lorem => :boolean
+  def paragraphs(amount=0)
+    amount = amount.to_i
+    opts = do_config
+    STDOUT.puts amount.lipsum_paragraphs opts if amount.to_i > 0
+  end
+
+  desc "words AMOUNT", "Downloads an AMOUNT of words from Lipsum.com"
+  method_options  :start_with_lorem => :boolean
+  def words(amount=0)
+    amount = amount.to_i
+    opts = do_config
+    STDOUT.puts amount.lipsum_words  if amount.to_i > 0
+  end
+
+  desc "lists AMOUNT", "Downloads an AMOUNT of lists from Lipsum.com"
+  method_options  :start_with_lorem => :boolean
+  def lists(amount=0)
+    amount = amount.to_i
+    opts = do_config
+    STDOUT.puts amount.lipsum_lists  if amount.to_i > 0
+  end
+
+  desc "bytes AMOUNT", "Downloads an AMOUNT of bytes from Lipsum.com"
+  method_options  :start_with_lorem => :boolean
+  def bytes(amount=0)
+    amount = amount.to_i
+    opts = do_config
+    STDOUT.puts amount.lipsum_bytes  if amount.to_i > 0
+  end
+
+  private
+  def do_config
+    options.start_with_lorem? ? {:start_with_lorem => true}:{}
+  end
+
+end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: lipsum-api
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
-  - 4
-  version: "0.4"
+  - 5
+  version: "0.5"
 platform: ruby
 authors: 
 - "Vicente Reig Rinc\xC3\xB3n de Arellano"
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 +02:00
+date: 2010-10-23 00:00:00 +02:00
 default_executable: lipsum
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: thor
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -32,7 +32,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: nokogiri
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,7 +46,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rest-client
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -57,10 +57,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rake
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -73,7 +73,21 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
-description: 
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+description: A library and command line client to interface Lipsum.com
 email: vicente.reig@gmail.com
 executables: 
 - lipsum
@@ -84,6 +98,7 @@ extra_rdoc_files: []
 files: 
 - bin/lipsum
 - lib/lipsum.rb
+- lib/lipsum_app.rb
 - test/fixtures/lipsum_bytes.html
 - test/fixtures/lipsum_words.html
 - test/fixtures/lipsum_lists.html
@@ -126,6 +141,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Another Lipsum generator written in Ruby
+summary: A Ruby interface to Lipsum.com
 test_files: []