dict 0.2.6 → 0.2.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dict (0.2.6)
+    dict (0.2.7)
       nokogiri (~> 1.5.5)
       slop (~> 3.3.2)
 

data/dict.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.name = %q{dict}
   s.version = Dict::VERSION
-  s.authors = ['Aleksander Gozdek', 'Mateusz Czerwinski', 'Michał Podlecki','Rafał Ośko']
+  s.authors = ['Aleksander Gozdek', 'Mateusz Czerwinski', 'Michał Podlecki', 'Rafał Ośko', 'Kosma Dunikowski']
   s.email = ['mtczerwinski@gmail.com']
   s.date = Time.now.strftime('%Y-%m-%d')
   s.summary = %q{Gem made for dictionary application}

data/lib/dict/cli/runner.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 require 'dict/dict'
+require 'dict/version'
 require 'slop'
 require 'timeout'
 
@@ -18,9 +19,10 @@ Usage: dict WORD [OPTIONS]
 Search WORD in dict, an open source dictionary aggregator.
           END
 
-          on '-h', :help, 'Display this help message'
+          on '-h', :help=, 'Display this help message', :argument => :optional
           on '-t', :time=, 'Set timeout in seconds. Default: 300', :as => :int
           on '-d', :dict=, "Select desired dictionary. Available options: #{Dict.available_dictionaries.join(', ')}"
+          on '-v', :version=, "Information about gem, authors, license", :argument => :optional
         end
         opts
       end
@@ -48,6 +50,10 @@ Search WORD in dict, an open source dictionary aggregator.
         end
       end
 
+      MSG = "Usage: dict WORD [OPTIONS]\nTry `dict --help for more information.\n"
+      VERSION = "dict version #{Dict::VERSION} \nCopyright (C) 2012 by Mateusz Czerwiński, Michał Podlecki,\nAleksander Gozdek, Rafał Ośko, Jan Borwin, Kosma Dunikowski\nLicense: MIT\nHomepage: https://github.com/Ragnarson/dict-gem\nSearch WORD in dict, an open source dictionary aggregator.\n" 
+
+      
       def run
         begin
           opts = parse_parameters
@@ -57,15 +63,17 @@ Search WORD in dict, an open source dictionary aggregator.
           abort("Missing argument. Expected: #{description}")
 
         end
-        
+            
         if opts.help?
           abort(opts.to_s)
+        elsif opts.version?
+          abort(VERSION)
         else
           if !parameters_valid?
-            abort("Please enter a word. (-h for help)")    
+            abort(MSG)
           else
             if opts.time?
-              if opts[:time].to_i == 0
+              if (opts[:time].to_i) == 0
                 abort("Wrong time value.")
               else
                 puts get_translations(opts, ARGV[0])
@@ -75,7 +83,7 @@ Search WORD in dict, an open source dictionary aggregator.
             end
           end
         end
-        
+
       end
     end
   end

data/lib/dict/version.rb

@@ -1,3 +1,3 @@
 module Dict
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/spec/dict/lib_dict_cli_runner_spec.rb

@@ -22,14 +22,14 @@ describe "parse_parameters" do
     stub_const("ARGV", ["słowik", "-t", "36"])
     runner = Dict::CLI::Runner.new
     opts = runner.parse_parameters
-    {:help=>nil, :time=>"36", :dict=>nil}.should == opts.to_hash
+    {:help=>nil, :time=>"36", :dict=>nil, :version=>nil}.should == opts.to_hash
   end
 
   it "should return Hash for parameters słowik" do
     stub_const("ARGV", ["słowik"])
     runner = Dict::CLI::Runner.new
     opts = runner.parse_parameters
-    {:help=>nil, :time=>nil, :dict=>nil}.should == opts.to_hash
+    {:help=>nil, :time=>nil, :dict=>nil, :version=>nil}.should == opts.to_hash
   end
 end
 
@@ -64,7 +64,7 @@ describe "get_translations" do
 end
 
 describe "CLI::Runner" do
-  HELP_MSG = "Usage: dict WORD [OPTIONS]\nSearch WORD in dict, an open source dictionary aggregator.\n\n    -h, --help      Display this help message\n    -t, --time      Set timeout in seconds. Default: 300\n    -d, --dict      Select desired dictionary. Available options: wiktionary, dictpl"
+  HELP_MSG = "Usage: dict WORD [OPTIONS]\nSearch WORD in dict, an open source dictionary aggregator.\n\n    -h, --help         Display this help message\n    -t, --time         Set timeout in seconds. Default: 300\n    -d, --dict         Select desired dictionary. Available options: wiktionary, dictpl\n    -v, --version      Information about gem, authors, license"
   DICT_MSG = "Missing argument. Expected: wiktionary, dictpl"
   TIME_MSG = "Missing argument. Expected: number of seconds"
   T_MSG = "Wrong time value."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dict
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,6 +9,7 @@ authors:
 - Mateusz Czerwinski
 - Michał Podlecki
 - Rafał Ośko
+- Kosma Dunikowski
 autorequire: 
 bindir: bin
 cert_chain: []