desi 0.4.0 → 0.5.0

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 .rvmrc
 .rbenv*
+tags

data/README.md

@@ -144,9 +144,13 @@ will be spun up by (`desi start`)
 
 ## Change setting(s)
 
-Right now, there's actually only one setting to change: the installation
-directory. Desi will look for files `/etc/desi.yml` or `~/.desi.yml` and use
-the *directory* entry specified. The default directory is `~/elasticsearch`.
+There are two settings at the moment: location of the installation directory
+(`directory`, default: `~/elasticsearch`) and ES host address (`server`,
+default: `localhost:9200`).
+
+Desi will look for files `/etc/desi.yml` or `~/.desi.yml` (the options found in
+the former will be overriden by the ones found in the latter).
+
 
   * command-line
 
@@ -157,6 +161,7 @@ the *directory* entry specified. The default directory is `~/elasticsearch`.
   ```ruby
   Desi.configure do |c|
     c.directory = "~/local/foo"
+    c.server = "192.168.1.42:9200"
   end
   ```
 

data/desi.gemspec

@@ -21,6 +21,7 @@ an Elastic Search local install for development purposes.}
   gem.add_development_dependency "guard-yard"
   gem.add_development_dependency "redcarpet"
   gem.add_development_dependency "rb-inotify"
+  gem.add_development_dependency "pry"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/desi/configuration.rb

@@ -15,9 +15,10 @@ module Desi
       @directory = Pathname(File.expand_path(dir))
     end
 
+    attr_accessor :server
+
     def load_configuration!
-      config = config_files_data
-      config = defaults if config.empty?
+      config = defaults.merge(config_files_data)
 
       public_methods(false).select {|m| m.to_s =~ /=$/ }.each do |setter|
         attr_name = setter.to_s.tr('=', '')
@@ -57,7 +58,7 @@ module Desi
     end
 
     def defaults
-      {'directory' => "~/elasticsearch"}
+      {'directory' => "~/elasticsearch", "server" => "localhost:9200"}
     end
 
     instance.load_configuration!
@@ -72,6 +73,7 @@ module Desi
   #
   # Desi.configure do |c|
   #   c.directory = "~/es"
+  #   c.server = "127.0.0.53:9200"
   # end
   #
   # @return [Desi::Configuration] the configuration

data/lib/desi/index_manager.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require "desi/http_client"
+require "desi/configuration"
 
 module Desi
 
@@ -33,7 +34,7 @@ module Desi
     #
     # @param       [#to_hash]  opts                             Hash of extra opts
     #
-    # @option opts [#to_s]     :host ('http://127.0.0.1:9200')  Host to manage indices for
+    # @option opts [#to_s]     :host ('http://localhost:9200')  Host to manage indices for
     # @option opts [Boolean]   :verbose   (nil) Whether to output the actions' result
     #                                           on STDOUT
     # @option opts [#new]      :http_client_factory (Desi::HttpClient) HTTP transport class
@@ -45,7 +46,7 @@ module Desi
     #
     # @api public
     def initialize(opts = {})
-      @host = to_uri(opts.fetch(:host, 'http://127.0.0.1:9200'))
+      @host = to_uri(opts.fetch(:host) { Desi.configuration.server })
       @verbose = opts[:verbose]
       @outputter = opts.fetch(:outputter, Kernel)
       @client = opts.fetch(:http_client_factory, Desi::HttpClient).new(@host)
@@ -137,7 +138,7 @@ module Desi
     end
 
     def to_uri(host_string)
-      scheme, host, port = ['http', '127.0.0.1', 9200]
+      scheme, host, port = ['http', 'localhost', 9200]
 
       %r{(?<scheme>(https?|))(?:\:\/\/|)(?<host>[^:]*?):?(?<port>\d*)/?$}.match(host_string.to_s) do |m|
         scheme = m[:scheme] unless m[:scheme].empty?

data/lib/desi/process_manager.rb

@@ -5,6 +5,7 @@ require "desi/cocaine"
 require "ostruct"
 require "desi/http_client"
 require "desi/local_install"
+require "desi/configuration"
 
 module Desi
 
@@ -23,7 +24,7 @@ module Desi
   class ProcessManager
 
     def initialize(opts = {})
-      @host = opts.fetch(:host, 'http://127.0.0.1:9200')
+      @host = opts.fetch(:host) { Desi.configuration.server }
       @verbose = opts[:verbose]
       @foreground = opts[:foreground]
       @local_install = LocalInstall.new

data/lib/desi/runner.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'boson/runner'
+require "desi/configuration"
 
 module Desi
   class Runner < Boson::Runner
@@ -84,7 +85,7 @@ module Desi
 
     desc "Show current status"
     verbosity_option
-    option "--host", type: :string, desc: "Elastic Search cluster URL", default: '127.0.0.1:9200'
+    option "--host", type: :string, desc: "Elastic Search cluster URL", default: Desi.configuration.server
     def status(options = {})
       set_verbosity!(options)
       Desi::ProcessManager.new(options).status
@@ -92,7 +93,7 @@ module Desi
 
     desc "List indices"
     verbosity_option
-    option "--host", type: :string, desc: "Elastic Search cluster URL", default: '127.0.0.1:9200'
+    option "--host", type: :string, desc: "Elastic Search cluster URL", default: Desi.configuration.server
     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 = {})
@@ -106,6 +107,10 @@ module Desi
       else
         index_manager.list(pattern)
       end
+
+    rescue Errno::ECONNREFUSED
+      warn "Server #{options[:host]} appears to be unavailable!"
+      exit 1
     end
 
     desc "Show tail output from Elastic Search's log file"

data/lib/desi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: desi
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boson
@@ -155,6 +155,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'Desi (Developper ElasticSearch Installer) is very simple tool to quickly
   set up
 
@@ -206,18 +222,12 @@ 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