metacrunch-elasticsearch 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17ba1fec96c7af64b5cdf8283dfee2fe0b4eadf1
-  data.tar.gz: fb673a9a460c7d7f82c96dfedc6a48fd26fdc971
+  metadata.gz: 26718380b20c6d344d4f356604d8800711f721a4
+  data.tar.gz: e4e38880f4709aebb74c76332d2e18f95fd0a2ae
 SHA512:
-  metadata.gz: 106cdda72d6b43bf2d52392b1f3d45e68bbd679427ec1ca582a265dc904d286415ce8e35a0464e867eca550661ef65232e983e72812c4bd815dbbb5c050dcf34
-  data.tar.gz: 7d3552381f7dbf8fab91d2d1e8a2ca8cc964304bfe2105baa760eeba71cbadd12748ffe6ef03b2a425f343fa37caf51dace45d2534eec8b783f4d30516ee658a
+  metadata.gz: 9662ded772976b51e221caf81938795a91da1dcb0b66c939143480ebad25b2292e5ccf657a9e86e52c77b9fe2444e0910f9e2f591d62aba2927714718efd0a2c
+  data.tar.gz: d7007c5911b76fbc3815fdff41a4b3aa8e55efe190d114b304ce46527986b8123e936e8a34d6f37a9e4ac2b2ca4062f8a272f5c4dd801bdae796d229953ca686

data/Gemfile

@@ -13,11 +13,10 @@ group :development do
 
   if !ENV["CI"]
     gem "hashdiff"
-    gem "pry",                "~> 0.9.12.6"
-    gem "pry-byebug",         "<= 1.3.2"
+    gem "pry",                "~> 0.10.3"
+    gem "pry-byebug",         "~> 3.3.0"
     gem "pry-rescue",         "~> 1.4.2"
-    gem "pry-stack_explorer", "~> 0.4.9.1"
-    gem "pry-syntax-hacks",   "~> 0.0.6"
+    gem "pry-state",          "~> 0.1.7"
   end
 end
 

data/lib/metacrunch/elasticsearch/cli/dump_metadata.rb

@@ -0,0 +1,84 @@
+require "elasticsearch"
+require_relative "../cli"
+
+class Metacrunch::Elasticsearch::Cli::DumpMetadata < Metacrunch::Command
+  def call
+    [:mappings, :settings].each do |_element|
+      _filename_option = "#{_element}_filename"
+
+      if options[_filename_option].present?
+        options["dump_#{_element}"] = true
+      end
+
+      if options[_filename_option] == _filename_option
+        options.delete(_filename_option)
+      end
+
+      if options["dump_#{_element}"]
+        if filename = options["#{_element}_filename"]
+          File.write(filename, format(send(_element), format_from_filename(filename)))
+        else
+          puts send(_element)
+        end
+      end
+    end
+
+    if !options[:dump_mapping] && !options[:dump_settings]
+      puts format(settings.merge(mappings), options[:format])
+      
+      if options[:format] == :yaml
+        $stderr.puts <<-MESSAGE.strip_heredoc
+
+          You have requested to dump settings and mapping into YAML. Please keep in mind
+          that if you are trying to create an index with both, settings and mapping, this
+          request has to be JSON formatted. Nevertheless you can create the index with YAML
+          settings and put a YAML formatted mapping afterwards.
+
+          https://github.com/elastic/elasticsearch/issues/1755
+
+        MESSAGE
+      end
+    end
+  end
+  alias_method :perform, :call
+
+  private
+
+  def client
+    @client ||= Elasticsearch::Client.new(url: options[:url])
+  end
+
+  def format(obj, format)
+    if format.to_sym == :json
+      JSON.pretty_generate(obj)
+    elsif format.to_sym == :yaml
+      YAML.dump(obj)
+    else
+      raise "Unknown output format!"
+    end
+  end
+
+  def format_from_filename(filename)
+    return nil if filename.blank?
+
+    case File.extname(filename)
+    when /json\Z/i then :json
+    when /yml\Z|yaml\Z/i then :yaml
+    end
+  end
+ 
+  def mappings
+    client.indices.get_mapping(index: @options[:index], type: @options[:type]).try(:values).try(:first)
+  end
+ 
+  def settings
+    client.indices.get_settings(index: @options[:index])
+    .try(:values)
+    .try(:first)
+    .try(:tap) do |_obj|
+      _obj["settings"]["index"].reject! do |_key, _|
+        ["creation_date", "uuid", "version"].include?(_key)
+      end
+    end
+  end
+end

data/lib/metacrunch/elasticsearch/cli/list_indices.rb

@@ -0,0 +1,19 @@
+require "elasticsearch"
+require_relative "../cli"
+
+class Metacrunch::Elasticsearch::Cli::ListIndices < Metacrunch::Command
+  def call
+    puts indices
+  end
+  alias_method :perform, :call
+
+  private
+
+  def client
+    @client ||= Elasticsearch::Client.new(url: @options[:url])
+  end
+
+  def indices
+    client.cat.indices(h: "index", format: :json).map { |_element| _element["index"] }
+  end
+end

data/lib/metacrunch/elasticsearch/cli.rb

@@ -0,0 +1,59 @@
+module Metacrunch
+  module Elasticsearch
+    module Cli
+      require_relative "./cli/dump_metadata"
+      require_relative "./cli/list_indices"
+      #require_relative "./cli/reindex_command"
+    end
+  end
+end
+
+Metacrunch::Cli.setup("elasticsearch", "Commands for Elasticsearch") do |r|
+  #
+  #
+  #
+  r.register(Metacrunch::Elasticsearch::Cli::DumpMetadata) do |c|
+    c.name  "dump_metadata"
+    c.usage "dump_metadata"
+    c.desc  "Dump index metadata"
+
+    c.option :url,
+      desc: "Elasticsearch url",
+      type: :string,
+      aliases: "-u",
+      required: true
+    c.option :format,
+      desc: "Output format",
+      type: :string,
+      aliases: "-f",
+      default: :yaml
+    c.option :mappings_filename,
+      desc: "Dump mappings",
+      aliases: "-m"
+    c.option :settings_filename,
+      desc: "Dump settings",
+      aliases: "-s",
+      default: false
+    c.option :index,
+      desc: "Index name",
+      aliases: "-i",
+      required: true
+    c.option :type,
+      desc: "Type to dump mapping for",
+      aliases: "-t",
+      default: "_default_"
+
+  end
+
+  r.register(Metacrunch::Elasticsearch::Cli::ListIndices) do |c|
+    c.name  "list_indices"
+    c.usage "list_indices"
+    c.desc  "List indices"
+
+    c.option :url,
+      desc: "Elasticsearch url",
+      type: :string,
+      aliases: "-u",
+      required: true
+  end
+end

data/lib/metacrunch/elasticsearch/index_creator.rb

@@ -11,10 +11,11 @@ class Metacrunch::Elasticsearch::IndexCreator < Metacrunch::Processor
   attr_accessor :default_mapping
   attr_accessor :delete_existing_index
   attr_accessor :logger
+  attr_accessor :settings
 
   def initialize(options = {})
     (@client_args = options).deep_symbolize_keys!
-    extract_options!(@client_args, :_client_options_, :default_mapping, :delete_existing_index, :logger, :number_of_shards, :number_of_replicas)
+    extract_options!(@client_args, :_client_options_, :default_mapping, :delete_existing_index, :logger, :number_of_shards, :number_of_replicas, :settings)
     raise ArgumentError.new("You have to supply an index name!") if @client_args[:index].blank?
   end
 
@@ -37,7 +38,8 @@ class Metacrunch::Elasticsearch::IndexCreator < Metacrunch::Processor
       {
         body: {
           number_of_shards: @number_of_shards,
-          number_of_replicas: @number_of_replicas
+          number_of_replicas: @number_of_replicas,
+          settings: @settings
         }.compact
       }
     ))

data/lib/metacrunch/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Metacrunch
   module Elasticsearch
-    VERSION = "2.1.0"
+    VERSION = "2.1.1"
   end
 end

data/lib/metacrunch/elasticsearch.rb

@@ -3,6 +3,7 @@ require "elasticsearch"
 
 module Metacrunch
   module Elasticsearch
+    require_relative "./elasticsearch/cli"
     require_relative "./elasticsearch/index_creator"
     require_relative "./elasticsearch/indexer"
     require_relative "./elasticsearch/reader"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metacrunch-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - René Sprotte
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -69,6 +69,9 @@ files:
 - bin/console
 - bin/setup
 - lib/metacrunch/elasticsearch.rb
+- lib/metacrunch/elasticsearch/cli.rb
+- lib/metacrunch/elasticsearch/cli/dump_metadata.rb
+- lib/metacrunch/elasticsearch/cli/list_indices.rb
 - lib/metacrunch/elasticsearch/client_factory.rb
 - lib/metacrunch/elasticsearch/index_creator.rb
 - lib/metacrunch/elasticsearch/indexer.rb
@@ -100,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Metacrunch elasticsearch package