priam 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/priam/command/insert.rb

@@ -9,7 +9,7 @@ module Priam::Command
       super_column = params[:super_column]
       raise_exception_flag = params[:raise_exception_flag]
       unit_size = params[:unit_size]
-      value_column = params[:value_column]
+      value_column = params[:value_column] || "d"
       weight_second = params[:weight_second]
       retry_max_count = params[:retry_max_count]
       count_log_path = params[:count_log_path]

data/lib/priam/core/common.rb

@@ -5,7 +5,6 @@ module Priam::Core
       port = 9160
       raise_exception_flag = false
       
-      value_column = "d"
       unit_size = 10000
       retry_max_count = 0
 

data/priam.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "priam"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kenji Hara"]

data/spec/bin/priam_spec.rb

@@ -66,25 +66,36 @@ describe "bin/priam" do
   end
   
   context "when command = get" do
-    context "when key&value exists" do
-      it "should output value" do
-        result = `echo key1 | #{Priam::RUBY_CMD} -I #{Priam::LIB_DIR} #{Priam::BIN_DIR}/priam get --keyspace PriamTest --column-family PriamCF -h #{@hostname} -p 9160 --name d --verbose #{@stderr_dst}`
-        result.chomp!
-        result.should == "val1"
+    context "without value-column option" do
+      context "when key&value exists" do
+        it "should output json" do
+          result = `echo key1 | #{Priam::RUBY_CMD} -I #{Priam::LIB_DIR} #{Priam::BIN_DIR}/priam get --keyspace PriamTest --column-family PriamCF -h #{@hostname} -p 9160 --verbose #{@stderr_dst}`
+          result.chomp!
+          result.should == '{"d":"val1"}'
+        end
       end
     end
-    context "when key&value does not exist" do
-      it "should not output value" do
-        result = `echo nokey | #{Priam::RUBY_CMD} -I #{Priam::LIB_DIR} #{Priam::BIN_DIR}/priam get --keyspace PriamTest --column-family PriamCF -h #{@hostname} -p 9160 --name d --verbose #{@stderr_dst}`
-        result.chomp!
-        result.should == ""
+    context "with value-column option" do
+      context "when key&value exists" do
+        it "should output value" do
+          result = `echo key1 | #{Priam::RUBY_CMD} -I #{Priam::LIB_DIR} #{Priam::BIN_DIR}/priam get --keyspace PriamTest --column-family PriamCF -h #{@hostname} -p 9160 --name d --verbose #{@stderr_dst}`
+          result.chomp!
+          result.should == "val1"
+        end
       end
-    end
-    context "when retry option is enabled" do
-      it "should output value" do
-        result = `echo key1 | #{Priam::RUBY_CMD} -I #{Priam::LIB_DIR} #{Priam::BIN_DIR}/priam get --keyspace PriamTest --column-family PriamCF -h #{@hostname} -p 9160 --name d --retry 5 --weight 1000 --verbose #{@stderr_dst}`
-        result.chomp!
-        result.should == "val1"
+      context "when key&value does not exist" do
+        it "should not output value" do
+          result = `echo nokey | #{Priam::RUBY_CMD} -I #{Priam::LIB_DIR} #{Priam::BIN_DIR}/priam get --keyspace PriamTest --column-family PriamCF -h #{@hostname} -p 9160 --name d --verbose #{@stderr_dst}`
+          result.chomp!
+          result.should == ""
+        end
+      end
+      context "when retry option is enabled" do
+        it "should output value" do
+          result = `echo key1 | #{Priam::RUBY_CMD} -I #{Priam::LIB_DIR} #{Priam::BIN_DIR}/priam get --keyspace PriamTest --column-family PriamCF -h #{@hostname} -p 9160 --name d --retry 5 --weight 1000 --verbose #{@stderr_dst}`
+          result.chomp!
+          result.should == "val1"
+        end
       end
     end
   end

data/spec/lib/priam/core/common_spec.rb

@@ -8,7 +8,7 @@ describe Priam::Core::Common do
         result[:host].should == "localhost"
         result[:port].should == 9160
         result[:raise_exception_flag].should == false
-        result[:value_column].should == "d"
+        result[:value_column].should == nil
         result[:retry_max_count].should == 0
         result[:check_exist_flag].should == false
         result[:output_keys_flag].should == false

data/spec/spec_helper.rb

@@ -45,7 +45,7 @@ create column family PriamCF
     tmpfile.puts cql
     tmpfile.close
     hostname = `hostname`.chomp
-    `/usr/lib/cassandra/bin/cassandra-cli -h #{hostname} -p 9160 -f #{tmpfile.path}`
+    `/usr/lib/cassandra/bin/cassandra-cli -h #{hostname} -p 9160 -f #{tmpfile.path} 2>/dev/null`
     tmpfile.unlink
   end
   
@@ -55,7 +55,7 @@ create column family PriamCF
     tmpfile.puts cql
     tmpfile.close
     hostname = `hostname`.chomp
-    `/usr/lib/cassandra/bin/cassandra-cli -h #{hostname} -p 9160 -f #{tmpfile.path}`
+    `/usr/lib/cassandra/bin/cassandra-cli -h #{hostname} -p 9160 -f #{tmpfile.path} 2>/dev/null`
     tmpfile.unlink
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: priam
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Kenji Hara