talks 0.4.0 → 0.4.1

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-18mode

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.4.1
+
+  * Refactoring and codeclimate added
+
 ## 0.4.0
 
   * Added options for Talks#say: :notify, :detach (@kossnocorp)

data/Gemfile.lock

@@ -0,0 +1,34 @@
+PATH
+  remote: .
+  specs:
+    talks (0.4.0)
+      notifier
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.2.3)
+    multi_json (1.7.2)
+    notifier (0.4.1)
+    rake (10.0.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+  rspec
+  simplecov
+  talks!

data/README.md

@@ -1,6 +1,6 @@
 # Talks gem — now your ruby and command-line tools can talk with you
 
-### Build Status ![http://travis-ci.org/ruby-talks/talks](https://secure.travis-ci.org/ruby-talks/talks.png)
+### Build Status ![http://travis-ci.org/gazay/talks](https://secure.travis-ci.org/gazay/talks.png) ![https://codeclimate.com/github/gazay/talks](https://codeclimate.com/github/gazay/talks.png)
 
 If you want to HEAR some response from your code or command-line tools, just use this gem.
 
@@ -13,11 +13,11 @@ find what notifier you want to use - there is support for every OS!
 
 I added in all sections of this readme notes about usage notifier
 functionality. And small
-[readme](https://github.com/ruby-talks/talks#using-talks-with-growl) about usage with Growl notifier.
+[readme](https://github.com/gazay/talks#using-talks-with-growl) about usage with Growl notifier.
 
 ### Here is a small [screencast](http://www.youtube.com/watch?v=PaUpwQMBvOY) about talks
 
-Soon we will finish the [wiki](https://github.com/ruby-talks/talks/wiki) and it will be (I hope) delimited and clear for understand.
+Soon we will finish the [wiki](https://github.com/gazay/talks/wiki) and it will be (I hope) delimited and clear for understand.
 
 Sponsored by Evil Martians <http://evilmartians.com>
 
@@ -40,6 +40,10 @@ You can find some examples of `talks` usage in organization [ruby-talks](https:/
   * [bundler-talks](https://github.com/ruby-talks/bundler-talks)
   * [spec-talks](https://github.com/ruby-talks/spec-talks)
 
+Examples from other people:
+
+  * [Autotesting tool on mocha, guard, rake and talks](https://gist.github.com/3150108) by @kossnocorp
+
 ## How?
 
 On MacOS X this gem is just using the native MacOS X `say` command line tool.
@@ -47,7 +51,7 @@ On linix/unix this gem is using espeak speech synthesis.
 
 For notifications this gem uses [notifier](https://github.com/fnando/notifier/blob/master/README.rdoc) gem.
 
-### In all examples below I've used MacOS X voice types. For espeak you can read section [Using talks with espeak](https://github.com/ruby-talks/talks#using-talks-with-espeak)
+### In all examples below I've used MacOS X voice types. For espeak you can read section [Using talks with espeak](https://github.com/gazay/talks#using-talks-with-espeak)
 
 ### Configuration
 
@@ -57,7 +61,12 @@ You can configure default voices and messages for `talks` with `~/.talksrc` file
 ```yml
 default_voice: 'whisper'
 engine: 'say'
-notifier: 'off' # if this option passed - you will not receive notifications at all
+notifier: 'off'            # if this option passed - you will not receive notifications at all
+notifier_options:
+  title: 'Not talks'
+  image: 'path/to/okay.png'
+detach: true               # added ' &' to command line command
+notify_by_default: true    # everytime when you call Talks#say - it will call Talks#notify
 voices:
   info: 'pipe'
 messages:
@@ -218,7 +227,7 @@ I did it myself.
 
 ### A lot of thanks
 
-  * @kossnocorp - for idea with notifiers.
+  * @kossnocorp - for idea with notifiers and his pulls.
 
   * @shime - for grammar fixes in readme and better explanation of my idea.
 

data/lib/talks.rb

@@ -1,5 +1,6 @@
 require File.expand_path('../talks/configuration.rb', __FILE__)
 require File.expand_path('../talks/hooks.rb', __FILE__)
+
 require 'notifier'
 
 module Talks

data/lib/talks/configuration.rb

@@ -30,15 +30,8 @@ module Talks
 
     def initialize(opts)
       @options = symbolize_hash_keys(opts)
-      @engine = options[:engine] || default_engine_for_os
-      @notifier_options = options[:notifier_options] || {}
-      @detach = options[:detach]
-      @notify_by_default = options[:notify_by_default]
-      @default_voice = options[:default_voice] || default_voice_for(engine)
-      @voices = options[:voices] && DEFAULT_VOICES[engine.to_sym].merge(options[:voices]) ||
-        DEFAULT_VOICES[engine.to_sym]
-      @messages = options[:messages] && DEFAULT_MESSAGES.merge(options[:messages]) ||
-        DEFAULT_MESSAGES
+
+      set_default_options
     end
 
     def voice(type)
@@ -57,10 +50,16 @@ module Talks
       "#{command_name} task #{position == :before ? 'started' : 'ended'}"
     end
 
-    def message_for(command_name, position = :after)
+    def message_for(command_name, position = :after, kind = 'message')
       command = command_name.to_sym
-      options[command] &&
-        options[command][(position == :before ? :before_message : :after_message)]
+      message = \
+        position == :before ? "before_#{kind}" : "after_#{kind}"
+
+      options[command][message.to_sym] if options[command]
+    end
+
+    def notify_message_for(command_name, position = :after)
+      message_for(command_name, position, 'notify')
     end
 
     def notifier_for(command_name)
@@ -73,12 +72,6 @@ module Talks
         )
     end
 
-    def notify_message_for(command_name, position = :after)
-      command = command_name.to_sym
-      options[command] &&
-        options[command][(position == :before ? :before_notify : :after_notify)]
-    end
-
     def voice_for(command_name)
       command = command_name.to_sym
       options[command] &&
@@ -87,6 +80,28 @@ module Talks
 
     private
 
+    def set_default_options
+      @engine            = options[:engine] || default_engine_for_os
+      @notifier_options  = options[:notifier_options] || {}
+      @detach            = options[:detach]
+      @notify_by_default = options[:notify_by_default]
+      @default_voice     = options[:default_voice] || default_voice_for(engine)
+      @voices            = voice_options
+      @messages          = messages_options
+    end
+
+    def voice_options
+      options[:voices] &&
+        DEFAULT_VOICES[engine.to_sym].merge(options[:voices]) ||
+        DEFAULT_VOICES[engine.to_sym]
+    end
+
+    def messages_options
+      options[:messages] &&
+        DEFAULT_MESSAGES.merge(options[:messages]) ||
+        DEFAULT_MESSAGES
+    end
+
     def default_voice_for(talks_engine)
       case talks_engine
       when 'say'

data/lib/talks/hooks.rb

@@ -1,3 +1,10 @@
+require File.expand_path('../hooks/base', __FILE__)
+require File.expand_path('../hooks/voice', __FILE__)
+require File.expand_path('../hooks/before_message', __FILE__)
+require File.expand_path('../hooks/after_message', __FILE__)
+require File.expand_path('../hooks/before_notify', __FILE__)
+require File.expand_path('../hooks/after_notify', __FILE__)
+
 module Talks
   module Hooks
     class << self
@@ -42,32 +49,18 @@ module Talks
         end
       end
 
-      def parse(options, command_name)
-        voice = options['-v'] || options['--voice'] ||
-          Talks.config.voice_for(command_name.to_sym) ||
-          Talks.config.default_voice
-
-        before_message = options['-bm'] || options['--before-message'] ||
-          Talks.config.message_for(command_name, :before) ||
-          Talks.config.default_message_for(command_name, :before)
-
-        after_message = options['-am'] || options['--after-message'] ||
-          Talks.config.message_for(command_name, :after) ||
-          Talks.config.default_message_for(command_name, :after)
-
-        before_notify = Talks.config.notifier_for(command_name) &&
-          (
-            options['-bn'] || options['--before-notify'] ||
-            Talks.config.notify_message_for(command_name, :before) ||
-            Talks.config.default_message_for(command_name, :before)
-          )
-
-        after_notify = Talks.config.notifier_for(command_name) &&
-          (
-            options['-an'] || options['--after-notify'] ||
-            Talks.config.notify_message_for(command_name, :after) ||
-            Talks.config.default_message_for(command_name, :after)
-          )
+      def parse(opts, cmd)
+        voice = Talks::Hooks::Voice.to_hook opts, cmd
+
+        before_message = Talks::Hooks::BeforeMessage.to_hook opts, cmd
+
+        after_message = Talks::Hooks::AfterMessage.to_hook opts, cmd
+
+        before_notify = Talks.config.notifier_for(cmd) &&
+          Talks::Hooks::BeforeNotify.to_hook(opts, cmd)
+
+        after_notify = Talks.config.notifier_for(cmd) &&
+          Talks::Hooks::AfterNotify.to_hook(opts, cmd)
 
         [voice, before_message, after_message, before_notify, after_notify]
       end

data/lib/talks/hooks/after_message.rb

@@ -0,0 +1,15 @@
+module Talks
+  module Hooks
+    class AfterMessage < Talks::Hooks::Base
+
+      class << self
+
+        def one_dash_argv; '-am'; end
+        def two_dashes_argv; '--after-message'; end
+        def message_name; :after; end
+
+      end
+
+    end
+  end
+end

data/lib/talks/hooks/after_notify.rb

@@ -0,0 +1,17 @@
+module Talks
+  module Hooks
+    class AfterNotify < Talks::Hooks::Base
+
+      class << self
+
+        def one_dash_argv; '-an'; end
+        def two_dashes_argv; '--after-notify'; end
+        def message_method; :notify_message_for; end
+        def default_message_method; :default_message_for; end
+        def message_name; :after; end
+
+      end
+
+    end
+  end
+end

data/lib/talks/hooks/base.rb

@@ -0,0 +1,21 @@
+module Talks
+  module Hooks
+    class Base
+      class << self
+
+        def one_dash_argv; ''; end
+        def two_dashes_argv; ''; end
+        def message_method; :message_for; end
+        def default_message_method; "default_#{message_method}"; end
+        def message_name; :before; end
+
+        def to_hook(opts, cmd)
+          opts[one_dash_argv] || opts[two_dashes_argv] ||
+            Talks.config.send(message_method, cmd, message_name) ||
+            Talks.config.send(default_message_method, cmd, message_name)
+        end
+
+      end
+    end
+  end
+end

data/lib/talks/hooks/before_message.rb

@@ -0,0 +1,14 @@
+module Talks
+  module Hooks
+    class BeforeMessage < Talks::Hooks::Base
+
+      class << self
+
+        def one_dash_argv; '-bm'; end
+        def two_dashes_argv; '--before-message'; end
+
+      end
+
+    end
+  end
+end

data/lib/talks/hooks/before_notify.rb

@@ -0,0 +1,17 @@
+module Talks
+  module Hooks
+    class BeforeNotify < Talks::Hooks::Base
+
+      class << self
+
+        def one_dash_argv; '-bn'; end
+        def two_dashes_argv; '--before-notify'; end
+        def message_method; :notify_message_for; end
+        def default_message_method; :default_message_for; end
+        def message_name; :before; end
+
+      end
+
+    end
+  end
+end

data/lib/talks/hooks/voice.rb

@@ -0,0 +1,19 @@
+module Talks
+  module Hooks
+    class Voice < Talks::Hooks::Base
+
+      class << self
+
+        def one_dash_argv; '-v'; end
+        def two_dashes_argv; '--voice'; end
+
+        def to_hook(opts, cmd)
+          opts[one_dash_argv] || opts[two_dashes_argv] ||
+            Talks.config.voice_for(cmd.to_sym) || Talks.config.default_voice
+        end
+
+      end
+
+    end
+  end
+end

data/lib/talks/version.rb

@@ -1,3 +1,3 @@
 module Talks
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/talks.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['gazay']
   s.email       = ['alex.gaziev@gmail.com']
-  s.homepage    = "https://github.com/ruby-talks/talks"
+  s.homepage    = "https://github.com/gazay/talks"
   s.summary     = %q{Gem for talking ruby code and command-line tools}
   s.description = %q{This gem can be used for wraping command-lines with `talks` command or for adding hooks in ruby code which would tell you something}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: talks
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: notifier
@@ -73,6 +73,7 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - bin/talking
@@ -80,12 +81,18 @@ files:
 - lib/talks.rb
 - lib/talks/configuration.rb
 - lib/talks/hooks.rb
+- lib/talks/hooks/after_message.rb
+- lib/talks/hooks/after_notify.rb
+- lib/talks/hooks/base.rb
+- lib/talks/hooks/before_message.rb
+- lib/talks/hooks/before_notify.rb
+- lib/talks/hooks/voice.rb
 - lib/talks/runner.rb
 - lib/talks/version.rb
 - spec/talks/basic_spec.rb
 - spec/test_data/talksrc
 - talks.gemspec
-homepage: https://github.com/ruby-talks/talks
+homepage: https://github.com/gazay/talks
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -105,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: talks
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Gem for talking ruby code and command-line tools