From 6b1a614818ef4ab1b8b224848172c0892d577b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Schr=C3=B6der?= <phoetmail@googlemail.com>
Date: Sun, 11 Mar 2012 16:06:58 +0100
Subject: [PATCH] remove railtie

---
 .gitignore                   |  1 -
 CHANGELOG.rdoc               |  4 +++
 Gemfile.lock                 | 57 ++++++++++++++++++++++++++++++++++++
 README.rdoc                  |  9 ------
 karotz.gemspec               |  3 +-
 lib/karotz.rb                |  2 --
 lib/karotz/client.rb         |  2 ++
 lib/karotz/rails/karotz.rake | 30 -------------------
 lib/karotz/rails/railtie.rb  |  9 ------
 9 files changed, 64 insertions(+), 53 deletions(-)
 create mode 100644 Gemfile.lock
 delete mode 100644 lib/karotz/rails/karotz.rake
 delete mode 100644 lib/karotz/rails/railtie.rb

diff --git a/.gitignore b/.gitignore
index 514c43c..230005a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 *.gem
 *.zip
 .bundle
-Gemfile.lock
 pkg/*
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 981014c..a60b08f 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,3 +1,7 @@
+== next
+
+* remove rails railtie
+
 == 0.4.1
 
 * remove direct httpclient dependency
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000..99790a9
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,57 @@
+PATH
+  remote: .
+  specs:
+    karotz (0.4.1)
+      crack (~> 0.3)
+      httpi (~> 0.9)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.7)
+    coderay (1.0.5)
+    crack (0.3.1)
+    diff-lcs (1.1.3)
+    ffi (1.0.11)
+    guard (1.0.1)
+      ffi (>= 0.5.0)
+      thor (~> 0.14.6)
+    guard-rspec (0.6.0)
+      guard (>= 0.10.0)
+    httpclient (2.2.4)
+    httpi (0.9.6)
+      rack
+    method_source (0.7.1)
+    pry (0.9.8.4)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
+    rack (1.4.1)
+    rake (0.9.2.2)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    slop (2.4.4)
+    thor (0.14.6)
+    vcr (1.11.3)
+    webmock (1.8.2)
+      addressable (>= 2.2.7)
+      crack (>= 0.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  guard-rspec
+  httpclient (~> 2.2)
+  karotz!
+  pry
+  rake
+  rspec
+  vcr (= 1.11.3)
+  webmock
diff --git a/README.rdoc b/README.rdoc
index 7e40481..153ae7c 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -61,15 +61,6 @@ via Bundler:
   [...]
   karotz.stop
 
-== Railtie
-
-The gem comes with two example Rake tasks, that are automatically included into your Rails application:
-
-  rake karotz:build:failed
-  rake karotz:build:normal
-
-Both Tasks are examples of how you could use your Karotz in a CI system like Jenkins.
-
 == Changes
 
 See CHANGELOG file.
diff --git a/karotz.gemspec b/karotz.gemspec
index b411eb8..dcf7189 100644
--- a/karotz.gemspec
+++ b/karotz.gemspec
@@ -17,14 +17,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rails", "~> 3.0"
   s.add_development_dependency "httpclient",  "~> 2.2"
   s.add_development_dependency "rake"
   s.add_development_dependency "pry"
   s.add_development_dependency "guard-rspec"
   s.add_development_dependency "rspec"
   s.add_development_dependency "webmock"
-  s.add_development_dependency "vcr"
+  s.add_development_dependency "vcr", "1.11.3"
 
   s.add_runtime_dependency "httpi",       "~> 0.9"
   s.add_runtime_dependency "crack",       "~> 0.3"
diff --git a/lib/karotz.rb b/lib/karotz.rb
index 2d81c6d..f45e643 100644
--- a/lib/karotz.rb
+++ b/lib/karotz.rb
@@ -4,5 +4,3 @@
 require "karotz/color"
 require "karotz/language"
 require "karotz/client"
-
-require "karotz/rails/railtie.rb" if defined?(Rails)
diff --git a/lib/karotz/client.rb b/lib/karotz/client.rb
index 54b36d0..ac0edf8 100644
--- a/lib/karotz/client.rb
+++ b/lib/karotz/client.rb
@@ -57,6 +57,8 @@ def tts(interactive_id, params={})
         request :tts, interactive_id, {:action => :speak, :text => "test", :lang => Language::ENGLISH}.merge(params)
       end
       alias :speak :tts
+      alias :say :tts
+      alias :talk :tts
 
       #============ASR================
 
diff --git a/lib/karotz/rails/karotz.rake b/lib/karotz/rails/karotz.rake
deleted file mode 100644
index 38691f5..0000000
--- a/lib/karotz/rails/karotz.rake
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace :karotz do
-  namespace :build do
-    desc "build failed trigger"
-    task :failed => :setup do
-      Karotz::Client.session do |karotz|
-        karotz.light :color => Karotz::Color::RED
-        karotz.speak :text => "build failed"
-        sleep(3) # kill session some time after talking
-      end
-    end
-
-    desc "build normal trigger"
-    task :normal => :setup do
-      Karotz::Client.session do |karotz|
-        karotz.light :color => Karotz::Color::GREEN
-        karotz.speak :text => "build normal"
-        sleep(3) # kill session some time after talking
-      end
-    end
-
-    task :setup do
-      Karotz::Configuration.configure do |config|
-        config.install_id = ENV['KAROTZ_INSTALL_ID']
-        config.api_key    = ENV['KAROTZ_API_KEY']
-        config.secret     = ENV['KAROTZ_SECRET']
-        config.proxy      = ENV['KAROTZ_PROXY']
-      end
-    end
-  end
-end
diff --git a/lib/karotz/rails/railtie.rb b/lib/karotz/rails/railtie.rb
deleted file mode 100644
index cb2a75a..0000000
--- a/lib/karotz/rails/railtie.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Karotz
-  module Rails
-    class Railtie < ::Rails::Railtie
-      rake_tasks do
-        load 'karotz/rails/karotz.rake'
-      end
-    end
-  end
-end