desi 0.2.9 → 0.3.0

data/README.md

@@ -55,7 +55,7 @@ will be spun up by (`desi start`)
 
   ```shell
   $ desi list
-  Local ES installs (current one is tagged with '*'):
+  Local ES installs in /home/me/elasticsearch (current one is tagged with '*'):
     * elasticsearch-0.19.9 (/home/me/elasticsearch/elasticsearch-0.19.9)
     - elasticsearch-0.19.8 (/home/me/elasticsearch/elasticsearch-0.19.8)
   ```
@@ -135,6 +135,25 @@ 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`.
+
+  * command-line
+
+    `echo -e "---\n  directory: ~/foobar" > ~/.desi.yml` for instance
+
+  * library
+
+  ```ruby
+  Desi.configure do |c|
+    c.directory = "~/local/foo"
+  end
+  ```
+
+
 
 ## Installation
 

data/lib/desi/configuration.rb

@@ -0,0 +1,87 @@
+# encoding: utf-8
+
+require "singleton"
+require "yaml"
+require "pathname"
+
+module Desi
+
+  class Configuration
+    include Singleton
+
+    attr_reader :directory
+
+    def directory=(dir)
+      @directory = Pathname(File.expand_path(dir))
+    end
+
+    def load_configuration!
+      config = config_files_data
+      config = defaults if config.empty?
+
+      public_methods(false).select {|m| m.to_s =~ /=$/ }.each do |setter|
+        attr_name = setter.to_s.tr('=', '')
+
+        if config.has_key?(attr_name)
+          send(setter, config[attr_name])
+        end
+      end
+
+      self
+    end
+
+    private
+
+    def config_files
+      %w[/etc/desi.yml ~/.desi.yml]
+    end
+
+    def config_files_data
+      config_files.each_with_object({}) do |filename, hash|
+        hash.merge! config_file_data(filename)
+      end
+    end
+
+    def config_file_data(filename)
+      file = File.expand_path(filename)
+      return {} unless File.exists?(file)
+
+      data = YAML.load_file(file)
+
+      if data.is_a? Hash
+        data
+      else
+        warn "Configuration file #{filename} contains malformed data and will be ignored"
+        {}
+      end
+    end
+
+    def defaults
+      {'directory' => "~/elasticsearch"}
+    end
+
+    instance.load_configuration!
+  end # Configuration
+
+  module_function
+
+
+  # Change configuration settings
+  #
+  # @example
+  #
+  # Desi.configure do |c|
+  #   c.directory = "~/es"
+  # end
+  #
+  # @return [Desi::Configuration] the configuration
+  def configure(&block)
+    yield configuration
+    configuration
+  end
+
+  def configuration
+    Configuration.instance
+  end
+
+end

data/lib/desi/local_install.rb

@@ -4,7 +4,6 @@ require "pathname"
 
 module Desi
   class LocalInstall
-    DEFAULT_DIR = '~/elasticsearch'
 
     class Release
       def self.all_in(workdir)
@@ -53,7 +52,7 @@ module Desi
 
     def initialize(workdir = nil, opts = {})
       @verbose = opts[:verbose]
-      @workdir = Pathname(File.expand_path(workdir || DEFAULT_DIR))
+      @workdir = Pathname(File.expand_path(workdir || Desi.configuration.directory))
       create!
     end
 

data/lib/desi/runner.rb

@@ -13,7 +13,7 @@ module Desi
     desc "List locally installed Elastic Search releases"
     verbosity_option
     def list(options = {})
-      puts "Local ES installs (current one is tagged with '*'):" unless quiet?(options)
+      puts "Local ES installs in #{Desi.configuration.directory} (current one is tagged with '*'):" unless quiet?(options)
       Desi::LocalInstall.new.releases.sort.reverse.each do |v|
         puts v
       end

data/lib/desi/version.rb

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

data/lib/desi.rb

@@ -1,6 +1,7 @@
 require "desi/version"
 
 module Desi
+  require 'desi/configuration'
   require 'desi/downloader'
   require 'desi/http_client'
   require 'desi/local_install'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: desi
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boson
@@ -180,6 +180,7 @@ files:
 - desi.gemspec
 - lib/desi.rb
 - lib/desi/cocaine.rb
+- lib/desi/configuration.rb
 - lib/desi/downloader.rb
 - lib/desi/http_client.rb
 - lib/desi/index_manager.rb
@@ -205,18 +206,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3536869085604684472
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3536869085604684472
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23