smogon_dex 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03af9b0e4de40c1faa5b2b0d4a453d5e49bc8803
-  data.tar.gz: 6047db50b007ff49f9bdb4bd8b11c67152593c56
+  metadata.gz: 616a7c4d2d855b51ba2b4ecd98cf8c6414c20f6f
+  data.tar.gz: 2a6d9065e956e4db1904bab15184f2ca5fc3b0af
 SHA512:
-  metadata.gz: c145caebccf5740d54450900371b6abce52d643bf98ab7c85814fa813102adfae11fdec119af84742243f46d991bc4edfc3aa72c0de0cbbacac1f6532a702dec
-  data.tar.gz: 3344dc5cbdd4456133018b74ded798901dc48cb2c58f734dd59304dfd5ee4606b4939d009e60672e68360cdcdd1dcd9fa8799b89f922d905f7a3ce2efe8500d1
+  metadata.gz: 6d4d42edc4a09911a02cad12bf223dcaf78e1f5bdd14a9183328dcc9b2eb02569cf1227cafe3481c449a0f8f205dd567d5914f2118244e53fd05218db2a6f71c
+  data.tar.gz: da3298962ea4b685e5665cc9023a3433549b2ee0962e4ca4682dd31f86a9ce389e51512b3261a00e74d60390ac478d2588b85ea3ecba7aa478529a3f309f6286

data/bin/smogon_dex

@@ -2,26 +2,44 @@
 require "launchy"
 require "smogon_dex"
 include SmogonDex
-gen, search_catagory = nil
+$gen, $catagory = nil
 
-ARGV.each do |arg|
-	Generations.each do |generation|
-		if arg == "--#{generation}" and gen.nil?
-			gen = generation
-			ARGV.delete arg
+ARGV.each do |given|
+	done = false
+	if given =~ /\A\-\-/
+		arg = given.gsub /\A\-\-/, ""
+		if arg == "home"
+			homepage
+			exit
 		end
-	end
-	Catagories.each do |catagory|
-		if arg == "--#{catagory}" and search_catagory.nil?
-			search_catagory = catagory
-			ARGV.delete arg
+		Generations.each do |generation|
+			if arg == generation and $gen.nil?
+				$gen, done = generation, true
+				break
+			end
+		end
+		Catagories.each do |catagory|
+			if arg == catagory and $catagory.nil?
+				$catagory = catagory
+				break
+			end
+		end unless done
+	elsif given =~ /\A\-/ and $catagory.nil?
+		$catagory = case given
+			when /a/ then "abilities"
+			when /m/ then "moves"
+			when /p/ then "pokemon"
+			when /i/ then "items"
+			when /f/ then "formats"
+			when /t/ then "types"
+			else raise "unknown switch: #{given}"
 		end
+	elsif $query.nil?
+		$query = given
+	else warn "Unknown argument: #{given}"
 	end
 end
-query = ARGV.shift unless ARGV.empty?
-search_catagory ||= "pokemon"
-gen ||= "xy"
-Launchy.open url(gen, search_catagory, query) 
+search(gen: $gen, catagory: $catagory, query: $query) 
 
 
 	

data/lib/smogon_dex.rb

@@ -1,8 +1,22 @@
+require "launchy"
 module SmogonDex
 	Catagories = %w(pokemon moves abilities items formats types)
 	Generations = %w(xy dp gs bw rb rs)
+
+	GEN_ARGS = Generations.map {|gen| "--#{gen}"}
+	CAT_ARGS = Catagories.map {|catagory| "-#{catagory}"}
+
 	module_function
-	def url(gen="xy", search_catagory="pokemon", query="")
-		"https://www.smogon.com/dex/" + gen + "/" + search_catagory + "/" + query
+	def search(data=Hash.new)
+		data[:gen] ||= "xy"
+		data[:catagory] ||= "pokemon"
+		data[:query] ||= String.new
+ 
+		raise ArgumentError, "#{data[:gen]} is not a valid generation" unless Generations.include? data[:gen]
+		raise ArgumentError, "#{data[:catagory]} is not a valid catagory." unless Catagories.include? data[:catagory]
+		Launchy.open "https://www.smogon.com/dex/#{ data.fetch :gen }/#{ data.fetch :catagory }/#{ data.fetch :query }"
+	end
+	def homepage
+		Launchy.open "https://www.smogon.com/dex"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smogon_dex
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Zachary R. Perlmutter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy