desi 0.6.9 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca6a85c9fea92581a05bf10fa46540fbb77458fe
-  data.tar.gz: 55517b9b24c7e2965e9ab78b03b43a4582f841f6
+  metadata.gz: 1a904d5f9b8c7b6a47443b5604430e886677404c
+  data.tar.gz: 925618b93f68d4f8a1a04d71804a2ceea4872a99
 SHA512:
-  metadata.gz: 0a6c23cda7bc27a2cb405051c371d437acdb5a99f2d57a25ffeda9024175cd14ef7f4bd489d8beb0532f4d4190e7cad22d6f0df914dddb44ade39abcbefb952e
-  data.tar.gz: c8fbbb9c547362f1a13512f366b254b850d573dde67b3ee70d03febbc755c7f3d4c8dda638565741299647f59c081e2541071b599c2be861f0ac0d612758c2f5
+  metadata.gz: cd305555d76f562c53990742890c322dd43a8269f2dbba816a1c796dd11160156a4b45dcbe9c13a033c454c4857871ccaf9b45d019a696886daec613e5d8dad5
+  data.tar.gz: 41bafd0856752105569549bb1e838342629f56afa7cb5470041c06af5de4585228fcd04b78662e343d3384ac157c9e85c3292d2d962beffaf3c30c26e606da57

data/README.md

@@ -26,9 +26,12 @@ It can be used both as a command-line tool and as a library.
     $ desi stop                  # Stop cluster
     $ desi status [--host HOST]  # Show running cluster info
     $ desi tail                  # Show tail output from Elastic Search's log file
+    $ desi current               # Show current version
+    $ desi current [VERSION]     # Change the symlink pointing to current version
 
     $ desi indices "^foo"          # List all indices whose name match /^foo/
     $ desi indices "^foo" --delete # Delete all matching indices
+    $ desi indices "^foo" --close  # Delete all matching indices
     $ desi indices "bar$" --empty  # Remove all records from the matching indices
 
 ## Examples (command-line and Ruby)

data/lib/desi/http_client.rb

@@ -38,6 +38,17 @@ module Desi
       end
     end
 
+    def post(uri)
+      response = @http.request(Net::HTTP::Post.new(uri))
+
+      case response
+        when Net::HTTPSuccess
+          response
+        else
+          raise response.error!
+      end
+    end
+
     def delete(uri)
       response = @http.request(Net::HTTP::Delete.new(uri))
 

data/lib/desi/index_manager.rb

@@ -132,6 +132,31 @@ module Desi
       end
     end
 
+    # Close all indices matching the specified pattern
+    #
+    # @param   [#to_s]          pattern  Regexp pattern used to restrict the selection
+    # @return  [void]
+    #
+    # @note No confirmation is needed, so beware!
+    #
+    # @note This method will also output its result on STDOUT if +@verbose+ is
+    #       true
+    #
+    # @example Close all indices whose name begins with "test"
+    #    Desi::IndexManager.new.close!('^test') #=> nil
+    #
+    # @api  public
+    def close!(pattern)
+      warn "You must provide a pattern" and exit if pattern.nil?
+
+      @outputter.puts "The following indices from host #{@host} are now closed" if @verbose
+
+      indices(Regexp.new(pattern)).each do |index|
+        @client.post("/#{index}/_close")
+        @outputter.puts " * #{index.inspect}" if @verbose
+      end
+    end
+
     # Empty (remove all records) from indices matching the specified pattern
     #
     # @param   [#to_s]          pattern  Regexp pattern used to restrict the selection

data/lib/desi/installer.rb

@@ -15,7 +15,7 @@ module Desi
     def install!
       extract! unless extracted?
       install_config_file
-      update_symlink!
+      update_symlinks!
       remove_archive!
     end
 
@@ -32,8 +32,10 @@ module Desi
     end
 
 
-    def update_symlink!
-      @local_install.update_current_to(release_dir)
+    def update_symlinks!
+      @local_install.
+        update_current_to(release_dir).
+        add_data_symlink(release_dir)
     end
 
     def config_file

data/lib/desi/local_install/release.rb

@@ -0,0 +1,78 @@
+# encoding: utf-8
+
+require "pathname"
+require "semantic"
+
+module Desi
+  class LocalInstall
+
+    class Release
+      def self.all_in(workdir)
+        Dir[workdir.join('*')].
+          select {|subdir| File.directory?(subdir) && File.basename(subdir) =~ /^elasticsearch\-\d+\.\d+\.\d+/ }.
+          map {|dirname| new(dirname, workdir) }
+      end
+
+      def initialize(dirname, workdir)
+        @dirname = Pathname.new(dirname)
+        @workdir = workdir
+      end
+
+      def name
+        @name ||= File.basename(@dirname)
+      end
+
+      def current?
+        current_symlink? && current_symlink.realpath == @dirname
+      end
+
+      def version
+        @version ||= Semantic::Version.new(version_number)
+      end
+
+      def with_version?(other_version)
+        version == Semantic::Version.new(other_version)
+      end
+
+      def to_s
+        current_mark = current? ? '*' : '-'
+
+        " #{current_mark} #{name} (#{@dirname})"
+      end
+
+      def ==(other)
+        other.version.to_s == version.to_s
+      end
+
+      def <=>(other)
+        name <=> other.name
+      end
+
+      def pre_one_zero?
+        @pre_one_zero ||= (version < Semantic::Version.new("1.0.0-alpha"))
+      end
+
+      def to_path
+        @dirname.to_path
+      end
+
+      private
+
+      def current_symlink
+        @current_symlink ||= Pathname(@workdir).join('current')
+      end
+
+      def current_symlink?
+        current_symlink.exist?
+      end
+
+      # Ugly hack to get around elasticsearch's flakey semver naming
+      # (e.g. `1.4.0.Beta1` instead of `1.4.0-beta1`)
+      def version_number
+        /^elasticsearch\-(?<version>.*)$/.match(name.to_s)[:version].
+          sub(/\.(alpha|beta)/i, '-\1')
+      end
+    end # Release
+
+  end
+end

data/lib/desi/local_install.rb

@@ -1,71 +1,10 @@
 # encoding: utf-8
 
-require "pathname"
-require "semantic"
+require_relative "local_install/release"
 
 module Desi
   class LocalInstall
 
-    class Release
-      def self.all_in(workdir)
-        Dir[workdir.join('*')].
-          select {|subdir| File.directory?(subdir) && File.basename(subdir) =~ /^elasticsearch\-\d+\.\d+\.\d+/ }.
-          map {|dirname| new(dirname, workdir) }
-      end
-
-      def initialize(dirname, workdir)
-        @dirname = Pathname.new(dirname)
-        @workdir = workdir
-      end
-
-      def name
-        @name ||= File.basename(@dirname)
-      end
-
-      def current?
-        current_symlink? && current_symlink.realpath == @dirname
-      end
-
-      def version
-        @version ||= Semantic::Version.new(version_number)
-      end
-
-      def to_s
-        current_mark = current? ? '*' : '-'
-
-        " #{current_mark} #{name} (#{@dirname})"
-      end
-
-      def ==(other)
-        other.version.to_s == version.to_s
-      end
-
-      def <=>(other)
-        name <=> other.name
-      end
-
-      def pre_one_zero?
-        @pre_one_zero ||= (version < Semantic::Version.new("1.0.0-alpha"))
-      end
-
-      private
-
-      def current_symlink
-        @current_symlink ||= Pathname(@workdir).join('current')
-      end
-
-      def current_symlink?
-        current_symlink.exist?
-      end
-
-      # Ugly hack to get around elasticsearch's flakey semver naming
-      # (e.g. `1.4.0.Beta1` instead of `1.4.0-beta1`)
-      def version_number
-        /^elasticsearch\-(?<version>.*)$/.match(name.to_s)[:version].
-          sub(/\.(alpha|beta)/i, '-\1')
-      end
-    end # Release
-
     def self.current_release_is_pre_one_zero?
       current = new.current_release
       current && current.pre_one_zero?
@@ -82,7 +21,7 @@ module Desi
     end
 
     def current_dir
-      @workdir.join('current')
+      @current_dir ||= @workdir.join('current')
     end
 
     def update_current_to(release_dir)
@@ -91,6 +30,15 @@ module Desi
       puts " * Updating #{current_dir} symlink" if @verbose
       FileUtils.remove(current_dir) if current_dir.exist?
       FileUtils.ln_sf(release_dir, current_dir)
+      self
+    end
+
+    def add_data_symlink(release_dir)
+      current_dir_must_be_nil_or_symlink!
+      symlink = current_dir.join('data')
+      puts " * Updating data dir symlink (#{symlink} -> #{data_dir})" if @verbose
+      FileUtils.ln_sf(data_dir, symlink)
+      self
     end
 
     def create!
@@ -109,6 +57,10 @@ module Desi
       @workdir.to_s
     end
 
+    def data_dir
+      @data_dir ||= @workdir.join('data')
+    end
+
     def to_s
       to_path
     end

data/lib/desi/runner.rb

@@ -54,6 +54,11 @@ module Desi
                   Desi::Upstream.new.latest_release
                 end
 
+      unless release
+        warn "Could not find release '#{version_or_full_name}'"
+        exit 1
+      end
+
       if Desi::LocalInstall.new.releases.any? {|r| r == release }
         puts " * release #{release.version} seems to be already installed" if options[:verbose]
         return
@@ -65,6 +70,27 @@ module Desi
       puts " * #{release} installed" if Desi::Installer.new(package).install! && options[:verbose]
     end
 
+
+    desc "Show or set the current version"
+    verbosity_option
+    def current(version = nil, options = {})
+      set_verbosity!(options)
+      local_install = Desi::LocalInstall.new
+
+      if version
+        dir = local_install.releases.find {|d| d.with_version?(version) }
+
+        unless dir
+          warn "Cannot find locale install of version #{version}"
+          exit 1
+        end
+        local_install.update_current_to(dir)
+        puts "Set current version to #{dir.version} (#{dir.to_path})" if options[:verbose]
+      else
+        puts local_install.current_release
+      end
+    end
+
     desc "Start Elastic Search (do nothing if already active)"
     verbosity_option
     start_options
@@ -100,6 +126,7 @@ module Desi
     verbosity_option
     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 "--close", type: :boolean, desc: "Close specified indices", default: false
     option "--empty", type: :boolean, desc:  "Delete all documents from the specified indices", default: false
     def indices(pattern = nil, options = {})
       set_verbosity!(options)
@@ -107,6 +134,8 @@ module Desi
 
       if options[:delete]
         index_manager.delete!(pattern)
+      elsif options[:close]
+        index_manager.close!(pattern)
       elsif options[:empty]
         index_manager.empty!(pattern)
       else

data/lib/desi/version.rb

@@ -1,3 +1,3 @@
 module Desi
-  VERSION = "0.6.9"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: desi
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors:
 - Dominique Rose-Rosette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boson
@@ -194,6 +194,7 @@ files:
 - lib/desi/index_manager.rb
 - lib/desi/installer.rb
 - lib/desi/local_install.rb
+- lib/desi/local_install/release.rb
 - lib/desi/process_manager.rb
 - lib/desi/runner.rb
 - lib/desi/upstream.rb