cherrypicker 0.3.5 → 0.3.6

data/README.md

@@ -18,9 +18,18 @@ Usage
 
 	require 'cherrypicker'
 	
-Examples
+Terminal Examples
 --------
+	Within your terminal type
+	
+	cherrypick
+
+	cherrypick http://www.youtube.com/watch?v=I5DCwN28y8o -d "~/Movies"
+	cherrypick http://rapidshare.com/files/453165880/test_file.txt -u "karlentwistle" -p "foobar"
 
+	
+Gem Examples
+--------
 	test = Rapidshare.new("http://rapidshare.com/files/329036215/myfile.rar", "username", "password")
 	test.download
 	

data/bin/cherrypick

@@ -5,7 +5,7 @@ require 'getoptlong'
 require 'pathname'
 
 def usage()
-	puts "Cherrypicker lets you download from; Rapidshare, Hotfile, Hotfile, Youtube, Vimeo & Megavideo"
+	puts "Cherrypicker lets you download from; Rapidshare, Hotfile, Youtube, Vimeo & Megavideo"
 	puts "Usage: cherrypick link [--directory|-d] [--username|-u] [--password|-p]"
 	puts
 	puts "example: cherrypick http://www.youtube.com/watch?v=I5DCwN28y8o -d \"~/Movies\""
@@ -17,45 +17,19 @@ if not ARGV[0]
 	exit
 end
 
+#refactored by Hamac credit http://is.gd/sbxAwG
+options = {username: nil, password: nil, directory: nil}
+
 parser = GetoptLong.new 
-parser.set_options(
-  ["-d", "--directory", GetoptLong::REQUIRED_ARGUMENT],
-	["-u", "--username", GetoptLong::REQUIRED_ARGUMENT], 
-	["-p", "--password", GetoptLong::REQUIRED_ARGUMENT]
+parser.set_options(*options.keys.map{|opt| ["--#{opt.to_s}", "-#{opt.to_s[0]}", GetoptLong::REQUIRED_ARGUMENT]}
 ) 
 
-username = ""
-password = ""
-directory = ""
-
-loop do 
+parser.each{|opt, arg| options[opt.gsub('--', '').to_sym] = arg unless arg == ''}
 
-	opt, arg = parser.get
-	break if not opt
-	
-	case opt
-		when "-u"
-			username = arg
-		when "-p"
-			password = arg
-		when "-d"
-		  directory = arg
-	end
-		
+if options[:directory] && !File.directory?(options[:directory]) then
+  puts "Directory not found " + directory
+  usage 
+  exit
 end
-
-unless directory == "" || nil?
-  p path = Pathname.new(directory) 
-
-  if not path.directory?
-  	puts "Directory not found " + path.to_s
-  	usage 
-  	exit
-  end
-end
-
-username = nil unless username != ""
-password = nil unless password != ""
-directory = nil unless directory != ""
-
-Cherrypicker::Cherrypick.new(ARGV[0], :location => directory, :username => username, :password => password)
+s
+Cherrypicker::Cherrypick.new(ARGV[0], :location => options[:directory], :username => options[:username], :password => options[:password])

data/lib/cherrypicker/version.rb

@@ -1,3 +1,3 @@
 module Cherrypicker
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -2,7 +2,7 @@
 name: cherrypicker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - Karl Entwistle
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-23 00:00:00 +01:00
+date: 2011-04-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency