talks 0.3.1 → 0.4.0

data/.travis.yml

@@ -8,4 +8,5 @@ rvm:
   - rbx-18mode
   - rbx-19mode
 # uncomment this line if your project needs to run something other than `rake`:
- script: rake 
+before_script: touch espeak && chmod a+x espeak && PATH=$PATH:$(pwd)
+script: rake

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 0.4.0
+
+  * Added options for Talks#say: :notify, :detach (@kossnocorp)
+  * Talks#notify more smart - get options for notifier (title, image, etc) (@kossnocorp)
+
+## 0.3.0
+
+  * Added notifier support (thanks to @kossnocorp)
+
 ## 0.2.0
 
   * Added espeak support

data/README.md

@@ -15,6 +15,10 @@ 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.
 
+### 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.
+
 Sponsored by Evil Martians <http://evilmartians.com>
 
 ## Why?
@@ -185,7 +189,7 @@ Talks.voices[:espeak]
 
 For [Growl](http://growl.info) you should be a Mac user. And you should have Growl version >= 1.3.
 
-If it's or for you - you need to do several steps for using talks with Growl:
+If it's ok for you - you need to do several steps for using talks with Growl:
 
   * Install the [growlnotify](http://growl.cachefly.net/GrowlNotify-1.3.zip) script
 
@@ -199,9 +203,11 @@ If it's or for you - you need to do several steps for using talks with Growl:
 Now you can use talks with Growl support:
 
 ```bash
-$: talking -bn 'This is before notification wich will shown with growl'
+$: talking -bn 'This is before notification wich will shown with growl' ls -la
 ```
 
+Here is the [screenshot](http://cl.ly/0K3V2F0A1C3O2z1q0923).
+
 ## Who?
 
 I did it myself.

data/lib/talks.rb

@@ -28,20 +28,34 @@ module Talks
       VOICES
     end
 
+    def engine
+      config.engine
+    end
+
     def say(message, options = {})
+      abort "Undefined engine: #{engine}" unless ["say","espeak"].include? engine
       type = options[:type] || :default
-      case config.engine
-      when 'say'
-        `say -v #{say_voice(type, options)} '#{message}'`
-      when 'espeak'
-        `espeak -v #{say_voice(type, options)} '#{message}'`
-      else
-        abort "Undefined engine: #{config.engine}"
-      end
+
+      notify(message) if options[:notify] || config.notify_by_default
+
+      command = [engine, '-v', say_voice(type, options), "#{message}"]
+      command << '&' if options[:detach] || config.detach
+
+      system command.join(' ')
     end
 
     def notify(message, options = {})
-      Notifier.notify message: message, title: 'Talks', image: ''
+      opts = \
+        {
+          :message => message,
+          :title => 'Talks',
+          :image => ''
+        }
+
+      opts.merge! config.notifier_options if config.notifier_options
+      opts.merge!(options)
+
+      Notifier.notify opts
     end
 
     def execute(command)
@@ -56,16 +70,18 @@ module Talks
     end
 
     TYPES.each do |type|
-      define_method type do |message = nil, options = {type: type}|
-        message ||= config.message(type)
-        say(message, options)
-      end
+      module_eval <<-RUBY_EVAL,__FILE__,__LINE__ + 1
+        def #{type}(message = nil, options = {:type => :#{type}})
+          message ||= config.message(:#{type})
+          say(message, options)
+        end
+      RUBY_EVAL
     end
 
     private
 
     def say_voice(type, options)
-      if options[:voice] and VOICES[config.engine.to_sym].include?(options[:voice].to_s)
+      if options[:voice] and VOICES[engine.to_sym].include?(options[:voice].to_s)
         options[:voice]
       elsif TYPES.include? type
         config.voice type

data/lib/talks/configuration.rb

@@ -25,11 +25,15 @@ module Talks
       :error   => 'Error'
     }
 
-    attr_accessor :voices, :messages, :default_voice, :options, :engine, :notifier
+    attr_accessor :voices, :messages, :default_voice, :options, :engine, :notifier,
+      :notifier_options, :detach, :notify_by_default
 
     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]

data/lib/talks/hooks.rb

@@ -2,15 +2,15 @@ module Talks
   module Hooks
     class << self
 
+
       def create(args)
-        engine = Talks.config.engine
         options, args = shift_options(args.dup)
         command_name = command args
         voice, before_message, after_message, before_notify, after_notify = \
           parse options, command_name
 
-        before_hook = hook(engine, voice, before_message)
-        after_hook = hook(engine, voice, after_message)
+        before_hook = hook(voice, before_message)
+        after_hook = hook(voice, after_message)
         command = args.join(' ')
 
         [before_notify, [before_hook, command, after_hook].join('; '), after_notify]
@@ -18,6 +18,10 @@ module Talks
 
       private
 
+      def engine
+        Talks.config.engine
+      end
+
       def shift_options(args, options={})
         # Check arguments for talks
         # one-two dashed. -v or --voice
@@ -68,7 +72,7 @@ module Talks
         [voice, before_message, after_message, before_notify, after_notify]
       end
 
-      def hook(engine, voice, message)
+      def hook(voice, message)
         "#{engine} -v #{voice} '#{message}'"
       end
 

data/lib/talks/version.rb

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

data/spec/talks/basic_spec.rb

@@ -12,7 +12,7 @@ describe Talks do
 
   it 'should have default methods' do
     [:add_hooks, :info, :error, :success, :warn, :say, :config].each do |method|
-      Talks.methods.include?(method).should be_true
+      Talks.instance_methods.map(&:to_s).include?(method.to_s).should be_true
     end
   end
 
@@ -59,26 +59,62 @@ describe Talks do
   context 'hooks' do
 
     it 'should create hooks for any command by default' do
-      Talks.add_hooks(['ls']).should == "#{talk_command} -v agnes 'ls task started'; ls; #{talk_command} -v agnes 'ls task ended'"
+      Talks.add_hooks(['ls']).should == ["ls task started","#{talk_command} -v agnes 'ls task started'; ls; #{talk_command} -v agnes 'ls task ended'","ls task ended"]
     end
 
     it 'should create preconfigured hooks for command from .talksrc' do
-      Talks.add_hooks(['bundle']).should == "#{talk_command} -v bad 'Bundle before message'; bundle; #{talk_command} -v bad 'Bundle after message'"
+      Talks.add_hooks(['bundle']).should == ["bundle task started","#{talk_command} -v bad 'Bundle before message'; bundle; #{talk_command} -v bad 'Bundle after message'","bundle task ended"]
     end
 
     it 'should change voice if option sended' do
-      Talks.add_hooks(['-v', 'vicki', 'ls']).should == "#{talk_command} -v vicki 'ls task started'; ls; #{talk_command} -v vicki 'ls task ended'"
+      Talks.add_hooks(['-v', 'vicki', 'ls']).should == ["ls task started","#{talk_command} -v vicki 'ls task started'; ls; #{talk_command} -v vicki 'ls task ended'","ls task ended"]
     end
 
     it 'should change messages if option sended' do
-      Talks.add_hooks(['-bm', 'test', 'ls']).should == "#{talk_command} -v agnes 'test'; ls; #{talk_command} -v agnes 'ls task ended'"
-      Talks.add_hooks(['-am', 'test', 'ls']).should == "#{talk_command} -v agnes 'ls task started'; ls; #{talk_command} -v agnes 'test'"
+      Talks.add_hooks(['-bm', 'test', 'ls']).should == ["ls task started","#{talk_command} -v agnes 'test'; ls; #{talk_command} -v agnes 'ls task ended'","ls task ended"]
+      Talks.add_hooks(['-am', 'test', 'ls']).should == ["ls task started","#{talk_command} -v agnes 'ls task started'; ls; #{talk_command} -v agnes 'test'","ls task ended"]
     end
 
     it 'should create hooks for command inside `bundle exec` by default' do
-      Talks.add_hooks(['bundle', 'exec', 'ls']).should == "#{talk_command} -v agnes 'ls task started'; bundle exec ls; #{talk_command} -v agnes 'ls task ended'"
+      Talks.add_hooks(['bundle', 'exec', 'ls']).should == ["ls task started","#{talk_command} -v agnes 'ls task started'; bundle exec ls; #{talk_command} -v agnes 'ls task ended'","ls task ended"]
     end
 
   end
 
+  describe "#say" do
+    it "should execute command with single quotes" do
+      Talks.should_receive(:system)
+      Talks.say "I'm talking like a boss"
+    end
+
+    it 'should show notification if :notify => true option passed' do
+      Talks.stub(:system)
+      Talks.should_receive(:notify).with('Hello there!')
+      Talks.say 'Hello there!', :notify => true
+    end
+
+    it 'should not detach say process if detach: false option passed' do
+      Talks.config.detach = nil
+      Talks.should_receive(:system).with(/!$/)
+      Talks.say 'Hello there!'
+    end
+
+    it 'should detach say process if :detach => true option passed' do
+      Talks.should_receive(:system).with(/\s&$/)
+      Talks.say 'Hello there!', :detach => true
+    end
+  end
+
+  describe '#notify' do
+    it 'should show growl notification with default title' do
+      Notifier.should_receive('notify').with({ :message => 'Hello there!' }.merge Talks.config.notifier_options)
+      Talks.notify 'Hello there!'
+    end
+
+    it 'should use passed options' do
+      Notifier.should_receive('notify').with(:message => 'Hello there!', :title => 'Hello?', :image => 'icon.ico')
+      Talks.notify 'Hello there!', :title => 'Hello?', :image => 'icon.ico'
+    end
+  end
+
 end

data/spec/test_data/talksrc

@@ -1,4 +1,9 @@
 default_voice: 'agnes'
+notify_by_default: true
+notifier_options:
+  title: 'Something'
+  image: 'icon.png'
+detach: true
 bundle:
   voice: 'bad'
   before_message: 'Bundle before message'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: talks
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: notifier