crate_ruby 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjcwMDRlZDFjZmI1YzcxZDMyOGRkNTFjNWZkNWRiY2Q4OTA0ZGIxMA==
-  data.tar.gz: !binary |-
-    Zjg3ZjYzMTgwNWI2OTBmZjFkYzhkMzhmYzE4YTBhZDk2Yzk5ZTc1NQ==
+SHA1:
+  metadata.gz: 72fb2668765dffdf58642563d96e75aa751e8c3c
+  data.tar.gz: f071d33f570d3108a9a34f4899a3f6ac63666f28
 SHA512:
-  metadata.gz: !binary |-
-    YzAwMjNlN2I2OGMxOGI2MTM4ZTUyYjE4NmRiYTc5MjQ4YTg3Y2YxY2QxZTY4
-    MTVjMjU5OTFlMDFmMWM2OGU3NzI0ZTE3MDg1MWYyNGRhOTMyOWNhYzc3YjVj
-    YmQyMjc4YmE2MTRjMjYwZTZiMDRhMjhmYzc3YTdhNmI4MmUxMTM=
-  data.tar.gz: !binary |-
-    MDNiMDQ2ZDdlODYzNDAzMDc1YzNiZWZlMzQ1MzI5M2NkMTdjYjNjMTYxMWI5
-    NmU5ODEwZWVlMjczYzE1ZTFmZDY1MThiMWE2OTAxNGI2ODlmMzUxZjJjYmQw
-    NjAyMTczYTM1Y2MwNzdlNDJkMTU1MWYzNzg4ZTdlZmU2ODI4NmQ=
+  metadata.gz: 95523cb97d5db61f189a383330e0d42e4877a9fb893ee6e6ec1ad11a156fc89a1836de17cba8446f4c18523b94b4b20b5fca8bdb6f40aca2e44a9f0389832a9e
+  data.tar.gz: 759a5002f9498893ea8c888ee3bcf9974c8e53620b5e3ef78f78b076481505404bec3dc63fd750069cab7c7192856a9b974b27f4f8fb40a5769917b42448e574

data/.travis.yml

@@ -1,16 +1,14 @@
 language: ruby
 rvm:
-  - "1.9.3"
-  - "2.1.1"
   - "2.0.0"
-# uncomment this line if your project needs to run something other than `rake`:
+  - "2.1.5"
+  - "2.2.0"
+sudo:
+  false
 
 before_script:
-  - wget https://cdn.crate.io/downloads/releases/crate-0.39.0.tar.gz -O /tmp/crate.tar.gz
+  - wget https://cdn.crate.io/downloads/releases/crate-0.48.2.tar.gz -O /tmp/crate.tar.gz
   - tar -xvf /tmp/crate.tar.gz
-  - ls
-  - echo $PWD
-  - bundle exec ruby spec/travis_test_server.rb $PWD/crate-0.39.0/ 4209
+  - bundle exec ruby spec/test_server.rb $PWD/crate-0.48.2/ true
 
 script: bundle exec rspec spec
-

data/LICENSE

@@ -1,5 +1,5 @@
 CRATE Ruby
-Copyright 2013-2014 CRATE Technology GmbH ("Crate")
+Copyright 2013-2015 CRATE Technology GmbH ("Crate")
 
 
 Licensed to CRATE Technology GmbH (referred to in this notice as "Crate")

data/NOTICE

@@ -1,5 +1,5 @@
 Crate Ruby
-Copyright 2013-2014 CRATE Technology GmbH ("Crate")
+Copyright 2013-2015 CRATE Technology GmbH ("Crate")
 
 
 =========================================================================

data/README.md

@@ -9,6 +9,8 @@ Official Ruby library to access a [Crate](http://crate.io) database.
 
 ## Installation
 
+This gem requires Ruby 2.0 or greater.
+
 Add this line to your application's Gemfile:
 
     gem 'crate_ruby'
@@ -34,34 +36,39 @@ Or install it yourself as:
 
     result.cols
      => ["id", "my_column", "my_integer_col"]
-     
-     
+
+
 #### Using parameter substitution
-     
+
      client.execute("INSERT INTO posts (id, title, tags) VALUES (\$1, \$2, \$3)",
                      [1, "My life with crate", ['awesome', 'freaky']])
 
 ### Up/Downloading data
+
     digest = Digest::SHA1.file(file_path).hexdigest
 
-    #upload
+    # upload
     f = File.read(file_path)
     client.blob_put(table_name, digest, f)
 
-    #download
+    # download
     data = client.blob_get(table_name, digest)
     open(file_path, "wb") do |file|
       file.write(data)
     end
 
-    #deletion
+    # deletion
     client.blob_delete(table_name, digest)
 
 ## Tests
 
-To run the tests start up the crate server first
+Start up the crate server before running the tests
+
+    ruby spec/test_server.rb /path/to/crate
 
-    ruby spec/test_server.rb
+Then run tests with
+
+    bundle exec rspec spec
 
 ## Contributing
 
@@ -76,4 +83,3 @@ Please refer to CONTRIBUTING.rst for further information.
 
 ##License & Copyright
 See LICENSE for details.
-

data/crate_ruby.gemspec

@@ -28,10 +28,11 @@ Gem::Specification.new do |spec|
   spec.version       = CrateRuby::VERSION
   spec.authors       = ["Christoph Klocker", "CRATE Technology GmbH"]
   spec.email         = ["office@crate.io"]
-  spec.summary       = "A simple interface to Crate Data."
-  spec.description   = "A ruby interface for Crate Data, a shared-nothing, fully searchable, document-oriented cluster data store."
+  spec.summary       = "A simple interface for the Crate database"
+  spec.description   = "A Ruby interface for Crate, the distributed database for Docker."
   spec.homepage      = "http://crate.io"
   spec.license       = "Apache License, v2.0"
+  spec.required_ruby_version = '>= 2.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/history.txt

@@ -1,5 +1,13 @@
 # coding: UTF-8
 
+=== unreleased
+
+=== 0.0.8
+
+  * removed ruby 1.9.3 from travis.yml
+  * client now supports HTTP options
+  * update travis.yml and fix broken test
+
 === 0.0.7
 
   * use prepared statements for insert

data/lib/crate_ruby/client.rb

@@ -32,11 +32,13 @@ module CrateRuby
     # @param [Array] servers An Array of servers including ports [127.0.0.1:4200, 10.0.0.1:4201]
     # @param [opts] Optional paramters
     # * logger: Custom Logger
+    # * http_options [Hash]: Net::HTTP options (open_timeout, read_timeout)
     # @return [CrateRuby::Client]
     def initialize(servers = [], opts = {})
       @servers = servers
       @servers << "#{DEFAULT_HOST}:#{DEFAULT_PORT}" if servers.empty?
       @logger = opts[:logger] || CrateRuby.logger
+      @http_options = opts[:http_options] || { read_timeout: 3600 }
     end
 
     def inspect
@@ -93,14 +95,15 @@ module CrateRuby
     # Executes a SQL statement against the Crate HTTP REST endpoint.
     # @param [String] sql statement to execute
     # @param [Array] args Array of values used for parameter substitution
+    # @param [Hash] Net::HTTP options (open_timeout, read_timeout)
     # @return [ResultSet]
-    def execute(sql, args = nil)
+    def execute(sql, args = nil, http_options = {})
       @logger.debug sql
       req = Net::HTTP::Post.new("/_sql", initheader = {'Content-Type' => 'application/json'})
       body = {"stmt" => sql}
       body.merge!({'args' =>  args}) if args
       req.body = body.to_json
-      response = request(req)
+      response = request(req, http_options)
       @logger.debug response.body
       success = case response.code
                   when /^2\d{2}/
@@ -207,9 +210,13 @@ module CrateRuby
       Net::HTTP.new(host, port)
     end
 
-    def request(req)
-      connection.start { |http| http.request(req) }
+    def request(req, http_options = {})
+      options = @http_options.merge(http_options)
+      connection.start do |http|
+        options.each { |opt, value| http.send("#{opt}=", value) }
+        http.request(req)
+      end
     end
 
   end
-end
+end

data/lib/crate_ruby/version.rb

@@ -20,5 +20,5 @@
 # software solely pursuant to the terms of the relevant commercial agreement.
 
 module CrateRuby
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/crate_ruby/client_spec.rb

@@ -23,8 +23,10 @@ require_relative '../spec_helper'
 
 describe CrateRuby::Client do
   TABLE_NAME = 'blob_table'
+  CRATE_HOST = "localhost:44200"
+
   describe '#create_table' do
-    let(:client) { CrateRuby::Client.new(["localhost:#{TEST_PORT}"]) }
+    let(:client) { CrateRuby::Client.new([CRATE_HOST]) }
 
     describe 'blob management' do
       let(:file) { 'logo-crate.png' }
@@ -34,11 +36,11 @@ describe CrateRuby::Client do
       let(:store_location) { File.join(path, "get_#{file}") }
 
       before(:all) do
-        CrateRuby::Client.new(["localhost:#{TEST_PORT}"]).execute("create blob TABLE #{TABLE_NAME}")
+        CrateRuby::Client.new([CRATE_HOST]).execute("create blob TABLE #{TABLE_NAME}")
       end
 
       after(:all) do
-        CrateRuby::Client.new(["localhost:#{TEST_PORT}"]).execute("drop blob TABLE #{TABLE_NAME}")
+        CrateRuby::Client.new([CRATE_HOST]).execute("drop blob TABLE #{TABLE_NAME}")
       end
 
       describe '#blob_put' do
@@ -51,7 +53,7 @@ describe CrateRuby::Client do
 
           it 'should upload a file to the blob table' do
             f = File.read(file_path)
-            client.blob_put(TABLE_NAME, digest, f).should be_true
+            client.blob_put(TABLE_NAME, digest, f).should be_truthy
           end
         end
 
@@ -75,7 +77,7 @@ describe CrateRuby::Client do
 
         it 'should download a blob' do
           data = client.blob_get(TABLE_NAME, digest)
-          data.should_not be_false
+          data.should_not be_falsey
           open(store_location, "wb") { |file|
             file.write(data)
           }
@@ -102,27 +104,32 @@ describe CrateRuby::Client do
       let(:table_name) { "post" }
 
       after do
-        client.execute("drop TABLE #{table_name}").should be_true
+        client.execute("drop TABLE #{table_name}").should be_truthy
       end
 
       it 'should create a new table' do
-        client.execute("CREATE TABLE #{table_name} (id int)").should be_true
+        client.execute("CREATE TABLE #{table_name} (id int)").should be_truthy
       end
 
       it 'should allow parameter substitution' do
-        client.execute("CREATE TABLE #{table_name} (id int, title string, tags array(string) )").should be_true
+        client.execute("CREATE TABLE #{table_name} (id int, title string, tags array(string) )").should be_truthy
         client.execute("INSERT INTO #{table_name} (id, title, tags) VALUES (\$1, \$2, \$3)",
-                       [1, "My life with crate", ['awesome', 'freaky']]).should be_true
+                       [1, "My life with crate", ['awesome', 'freaky']]).should be_truthy
       end
 
       it 'should create an object' do
         client.execute("CREATE TABLE  #{table_name} (id STRING PRIMARY KEY, name string, address object) ")
-        client.execute(%Q{INSERT INTO  #{table_name} (address, id, name) VALUES ({"street"="1010 W 2nd Ave","city"="Vancouver"}, 'fb7183ac-d049-462c-85a9-732aca59a1c1', 'Mad Max')})
+        client.execute(%Q{INSERT INTO  #{table_name} (address, id, name) VALUES ({street='1010 W 2nd Ave',city='Vancouver'}, 'fb7183ac-d049-462c-85a9-732aca59a1c1', 'Mad Max')})
         client.refresh_table table_name
         client.execute(%Q{select * from #{table_name}})
-
       end
 
+      it 'should accept http options' do
+        client.execute("CREATE TABLE  #{table_name} (id STRING PRIMARY KEY, name string, address object) ")
+        client.execute(%Q{INSERT INTO  #{table_name} (address, id, name) VALUES ({street='1010 W 2nd Ave',city='Vancouver'}, 'fb7183ac-d049-462c-85a9-732aca59a1c1', 'Mad Max')})
+        client.refresh_table table_name
+        expect { client.execute("SELECT * FROM #{table_name}", nil, {read_timeout: 0}) }.to raise_error Net::ReadTimeout
+      end
     end
 
 

data/spec/spec_helper.rb

@@ -20,4 +20,4 @@
 # software solely pursuant to the terms of the relevant commercial agreement.
 
 require_relative '../lib/crate_ruby'
-TEST_PORT = 4209
+require 'net/http'

data/spec/test_server.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 # -*- coding: utf-8; -*-
 #
 # Licensed to CRATE Technology GmbH ("Crate") under one or more contributor
@@ -20,57 +21,53 @@
 # software solely pursuant to the terms of the relevant commercial agreement.
 
 require 'net/http'
+
 class TestServer
-  CRATE_PATH = "~/crate"
-  TEST_PORT = 4209
   NAME = "TestCluster"
+  HOST = "127.0.0.1"
+  PORT = 44200
+  TIMEOUT = 30
 
-
-  def initialize(crate_home = nil, port = nil, host = "127.0.0.1")
-    @crate_home = crate_home || CRATE_PATH
-    @port = port || TEST_PORT
-    @host = host
+  def initialize(crate_home = '~/crate', run_in_background = false)
+    @crate_home = crate_home
+    @run_in_background = run_in_background
   end
 
   def start
-    cmd = "sh #{CRATE_PATH}/bin/crate #{start_params}"
-    @pid = spawn(cmd, :out => "/tmp/crate_test_server.out", :err => "/tmp/crate_test_server.err")
+    cmd = "sh #{File.join(@crate_home, 'bin', 'crate')} #{start_params}"
+    @pid = spawn(cmd, out: "/tmp/crate_test_server.out",
+                 err: "/tmp/crate_test_server.err")
     Process.detach(@pid)
-    puts 'starting'
+    puts 'Starting Crate... (this will take a few seconds)'
     time_slept = 0
+    interval = 2
     while true
-      puts "Crate not yet fully available. Waiting since #{time_slept} seconds..." unless alive?
-      sleep(2)
-      time_slept += 2
+      if !alive? and time_slept > TIMEOUT
+        puts "Crate hasn't started for #{TIMEOUT} seconds. Giving up now..."
+        exit
+      end
+      if alive? and @run_in_background
+        exit
+      end
+      sleep(interval)
+      time_slept += interval
     end
   end
 
-  def stop
-    Process.kill("HUP", @pid)
-  end
-
   private
 
-
-  def crate_exec
-  end
-
-  def crate_config
-  end
-
   def start_params
     "-Des.index.storage.type=memory " +
         "-Des.node.name=#{NAME} " +
-        "-Des.cluster.name=Testing#{@port} " +
-        "-Des.http.port=#{@port}-#{@port} " +
+        "-Des.cluster.name=Testing#{PORT} " +
+        "-Des.http.port=#{PORT}-#{PORT} " +
         "-Des.network.host=localhost " +
-        "-Des.discovery.type=zen " +
         "-Des.discovery.zen.ping.multicast.enabled=false"
   end
 
   def alive?
     req = Net::HTTP::Get.new('/')
-    resp = Net::HTTP.new(@host, @port)
+    resp = Net::HTTP.new(HOST, PORT)
     begin
       response = resp.start { |http| http.request(req) }
       response.code == "200" ? true : false
@@ -78,14 +75,7 @@ class TestServer
       false
     end
   end
-
 end
 
-server = TestServer.new.start *ARGV
-
-trap("INT") do
-  puts "Script terminated by user."
-  server.stop
-  puts "Server stopped"
-  exit
-end
+server = TestServer.new(*ARGV)
+server.start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crate_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Christoph Klocker
@@ -9,60 +9,59 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
-description: A ruby interface for Crate Data, a shared-nothing, fully searchable,
-  document-oriented cluster data store.
+description: A Ruby interface for Crate, the distributed database for Docker.
 email:
 - office@crate.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CONTRIBUTING.rst
 - DEVELOP.md
 - Gemfile
@@ -82,7 +81,6 @@ files:
 - spec/crate_ruby/result_set_spec.rb
 - spec/spec_helper.rb
 - spec/test_server.rb
-- spec/travis_test_server.rb
 - spec/uploads/get_logo-crate.png
 - spec/uploads/logo-crate.png
 - spec/uploads/text.txt
@@ -96,26 +94,25 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: A simple interface to Crate Data.
+summary: A simple interface for the Crate database
 test_files:
 - spec/crate_ruby/client_spec.rb
 - spec/crate_ruby/result_set_spec.rb
 - spec/spec_helper.rb
 - spec/test_server.rb
-- spec/travis_test_server.rb
 - spec/uploads/get_logo-crate.png
 - spec/uploads/logo-crate.png
 - spec/uploads/text.txt

data/spec/travis_test_server.rb

@@ -1,75 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8; -*-
-#
-# Licensed to CRATE Technology GmbH ("Crate") under one or more contributor
-# license agreements.  See the NOTICE file distributed with this work for
-# additional information regarding copyright ownership.  Crate licenses
-# this file to you under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.  You may
-# obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# However, if you have executed another commercial license agreement
-# with Crate these terms will supersede the license and you may use the
-# software solely pursuant to the terms of the relevant commercial agreement.
-
-require 'net/http'
-class TestServer
-  CRATE_PATH = "~/crate"
-  TEST_PORT = 4209
-  NAME = "TestCluster"
-
-
-  def initialize(crate_home = nil, port = nil)
-    @crate_home = crate_home
-    @port = port
-    @host = "127.0.0.1"
-  end
-
-  def start
-    cmd = "sh #{File.join(@crate_home, 'bin/crate')} #{start_params}"
-    @pid = spawn(cmd, :out => "/tmp/crate_test_server.out", :err => "/tmp/crate_test_server.err")
-    Process.detach(@pid)
-    puts 'starting'
-    time_slept = 0
-    while !alive?
-      puts "Crate not yet fully available. Waiting since #{time_slept} seconds..."
-      sleep(2)
-      time_slept += 2
-    end
-  end
-
-  private
-
-  def start_params
-    "-Des.index.storage.type=memory " +
-        "-Des.node.name=#{NAME} " +
-        "-Des.cluster.name=Testing#{@port} " +
-        "-Des.http.port=#{@port}-#{@port} " +
-        "-Des.network.host=localhost " +
-        "-Des.discovery.type=zen " +
-        "-Des.discovery.zen.ping.multicast.enabled=false"
-  end
-
-  def alive?
-    req = Net::HTTP::Get.new('/')
-    resp = Net::HTTP.new(@host, @port)
-    begin
-      response = resp.start { |http| http.request(req) }
-      response.code == "200" ? true : false
-    rescue Errno::ECONNREFUSED
-      false
-    end
-  end
-
-end
-
-server = TestServer.new *ARGV
-server.start