desi 0.3.0 → 0.4.0

data/README.md

@@ -1,6 +1,7 @@
 Desi
 ====
 [![Build Status](https://secure.travis-ci.org/AF83/desi.png)](http://travis-ci.org/AF83/desi)
+[![Gem Version](https://badge.fury.io/rb/desi.png)](http://badge.fury.io/rb/desi)
 
 Desi (Developper ElasticSearch Installer) is very simple tool to quickly set up
 an [Elastic Search](http://www.elasticsearch.org/) local install for
@@ -24,6 +25,7 @@ It can be used both as a command-line tool and as a library.
     $ desi restart               # (Re)start cluster (even if active)
     $ desi stop                  # Stop cluster
     $ desi status [--host HOST]  # Show running cluster info
+    $ desi tail                  # Show tail output from Elastic Search's log file
 
     $ desi indices "^foo"          # List all indices whose name match /^foo/
     $ desi indices "^foo" --delete # Delete all matching indices
@@ -77,8 +79,13 @@ will be spun up by (`desi start`)
    * Elastic Search 0.19.9 started
   $ desi status
   OK. Elastic Search cluster 'elasticsearch' (v0.19.9) is running on 1 node(s) with status yellow
-  ```
 
+  # Start Elastic Search in the foreground
+  $ desi start -f # or --foreground
+  ES will be launched in the foreground
+  ^C # Manual stop with Control-C
+  Elastic Search interrupted!
+  ```
 
   * library
 

data/lib/desi/local_install.rb

@@ -92,6 +92,10 @@ module Desi
       @workdir.join('elasticsearch.pid')
     end
 
+    def logfile
+      current_dir.join('logs', 'elasticsearch.log')
+    end
+
     def launcher
       current_dir.join('bin', 'elasticsearch')
     end

data/lib/desi/process_manager.rb

@@ -25,8 +25,16 @@ module Desi
     def initialize(opts = {})
       @host = opts.fetch(:host, 'http://127.0.0.1:9200')
       @verbose = opts[:verbose]
+      @foreground = opts[:foreground]
       @local_install = LocalInstall.new
       @client = opts.fetch(:http_client_factory, Desi::HttpClient).new(@host)
+
+      @tail_after_start = opts[:tail]
+
+      if @tail_after_start && @foreground
+        $stderr.puts "Cannot tail logs when starting ES in foreground mode"
+        exit 1
+      end
     end
 
     # Start the cluster
@@ -136,6 +144,14 @@ module Desi
       end
     end
 
+    def show_tail(options = {})
+      puts "Will tail ES logs…" if @verbose
+      executable = "tail"
+      lines = Integer(options.fetch(:lines, 10))
+
+      system "#{executable} -n #{lines} -f #{logfile}"
+    end
+
     protected
 
     # Return cluster health data straight from the cluster
@@ -151,6 +167,10 @@ module Desi
 
     private
 
+    def logfile
+      @local_install.logfile
+    end
+
     def wait_until_cluster_becomes_ready(max_wait = 10, step = 0.5)
       wait_for(max_wait, step) { cluster_ready? }
     end
@@ -160,8 +180,9 @@ module Desi
     end
 
     def start_cluster
-      line = Cocaine::CommandLine.new(@local_install.launcher.to_s, "-p :pidfile")
-      line.run(pidfile: pidfile.to_s)
+      catch_manual_interruption!
+      perform_start
+      show_tail if tail_after_start?
 
       unless wait_until_cluster_becomes_ready
         raise "Cluster still not ready after #{max_wait} seconds!"
@@ -206,6 +227,37 @@ module Desi
       delay < max_wait
     end
 
+    def perform_start
+      puts "ES will be launched in the foreground" if foreground?
+
+      Cocaine::CommandLine.new(@local_install.launcher.to_s, *start_command_options).
+        run(pidfile: pidfile.to_s)
+    end
+
+    def start_command_options
+      ['-p :pidfile', @foreground ? '-f' : nil].compact.join(' ')
+    end
+
+    def foreground?
+      !!@foreground
+    end
+
+    def tail_after_start?
+      @tail_after_start
+    end
+
+    def catch_manual_interruption!
+      if foreground?
+        old_handler = trap(:INT) do
+          $stderr.puts "Elastic Search interrupted!"
+          if old_handler.respond_to?(:call)
+            old_handler.call
+          else
+            exit 1
+          end
+        end
+      end
+    end
 
   end
 end

data/lib/desi/runner.rb

@@ -10,10 +10,16 @@ module Desi
       option :quiet,   type: :boolean, desc: "Do not output anything", default: !STDOUT.tty?
     end
 
+    def self.start_options
+      option :foreground, type: :boolean, desc: "Run ES in the foreground", default: false
+      option :tail, type: :boolean, desc: "Run tail after (re)starting", default: false
+    end
+
     desc "List locally installed Elastic Search releases"
     verbosity_option
     def list(options = {})
-      puts "Local ES installs in #{Desi.configuration.directory} (current one is tagged with '*'):" unless quiet?(options)
+      set_verbosity!(options)
+      puts "Local ES installs in #{Desi.configuration.directory} (current one is tagged with '*'):" if options[:verbose]
       Desi::LocalInstall.new.releases.sort.reverse.each do |v|
         puts v
       end
@@ -23,57 +29,65 @@ module Desi
     verbosity_option
     option :limit, type: :numeric, desc: "Number of releases to show (0 for all)", default: 5
     def releases(options = {})
+      set_verbosity!(options)
       limit = options[:limit]
       releases = Desi::Upstream.new.releases.each_with_index.
         take_while {|rel, i| i < limit || limit == 0 }.map(&:first)
 
-      if quiet?(options)
-        releases
-      else
+      if options[:verbose]
         puts "Here are #{limit == 0 ? 'all the' : "the #{limit} latest"} releases"
         releases.each {|rel| puts " - #{rel.name}" }
+      else
+        releases
       end
     end
 
     desc "Install ES (to latest stable version by default)"
     verbosity_option
     def install(version_or_full_name = nil, options = {})
+      set_verbosity!(options)
       release = if version_or_full_name
                   Desi::Upstream.new.find_release(version_or_full_name)
                 else
-                  puts " * No release specified, will fetch latest." unless quiet?(options)
+                  puts " * No release specified, will fetch latest." if options[:verbose]
                   Desi::Upstream.new.latest_release
                 end
 
-      puts " * fetching release #{release}" unless quiet?(options)
-      package = Desi::Downloader.new(verbose: !quiet?(options)).download!(release)
+      puts " * fetching release #{release}" if options[:verbose]
+      package = Desi::Downloader.new(options).download!(release)
 
-      puts " * #{release} installed" if Desi::Installer.new(package).install! && !quiet?(options)
+      puts " * #{release} installed" if Desi::Installer.new(package).install! && options[:verbose]
     end
 
     desc "Start Elastic Search (do nothing if already active)"
     verbosity_option
+    start_options
     def start(options = {})
-      Desi::ProcessManager.new(verbose: !quiet?(options)).start
+      set_verbosity!(options)
+      Desi::ProcessManager.new(options).start
     end
 
     desc "Start or restart Elastic Search (restart if already active)"
     verbosity_option
+    start_options
     def restart(options = {})
-      Desi::ProcessManager.new(verbose: !quiet?(options)).restart
+      set_verbosity!(options)
+      Desi::ProcessManager.new(options).restart
     end
 
     desc "Stop Elastic Search"
     verbosity_option
     def stop(options = {})
-      Desi::ProcessManager.new(verbose: !quiet?(options)).stop
+      set_verbosity!(options)
+      Desi::ProcessManager.new(options).stop
     end
 
     desc "Show current status"
     verbosity_option
     option "--host", type: :string, desc: "Elastic Search cluster URL", default: '127.0.0.1:9200'
     def status(options = {})
-      Desi::ProcessManager.new(verbose: !quiet?(options), host: options[:host]).status
+      set_verbosity!(options)
+      Desi::ProcessManager.new(options).status
     end
 
     desc "List indices"
@@ -82,7 +96,8 @@ module Desi
     option "--delete", type: :boolean, desc: "Delete the specified indices (You've been warned!)", default: false
     option "--empty", type: :boolean, desc:  "Delete all documents from the specified indices", default: false
     def indices(pattern = nil, options = {})
-      index_manager = Desi::IndexManager.new(verbose: !quiet?(options), host: options[:host])
+      set_verbosity!(options)
+      index_manager = Desi::IndexManager.new(options)
 
       if options[:delete]
         index_manager.delete!(pattern)
@@ -93,19 +108,15 @@ module Desi
       end
     end
 
-    # desc "Upgrade to latest ElasticSearch version"
-    # def upgrade
-    # end
-
-    # desc "Switch currently active ES version to VERSION"
-    # option :version, type: :string
-    # def switch
-    # end
+    desc "Show tail output from Elastic Search's log file"
+    def tail
+      Desi::ProcessManager.new.show_tail
+    end
 
     private
 
-    def quiet?(opts = {})
-      opts[:quiet] || !opts[:verbose]
+    def set_verbosity!(opts)
+      opts[:verbose] ||= opts.delete(:quiet)
     end
 
   end

data/lib/desi/version.rb

@@ -1,3 +1,3 @@
 module Desi
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: desi
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boson
@@ -206,12 +206,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2218572512027312974
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2218572512027312974
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23