priam 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/lib/priam/command/get.rb

@@ -8,6 +8,7 @@ module Priam::Command
       column_family = params[:column_family]
       super_column = params[:super_column]
       name = params[:value_column]
+      with_key_flag = params[:with_key_flag]
 
       client = Cassandra.new(keyspace, "#{host}:#{port}")
       
@@ -26,6 +27,10 @@ module Priam::Command
         end
       
         record = Priam.get_column(client, column_family, super_column, key, params)    
+
+        if with_key_flag
+          output_stream.print "#{key}\t"
+        end
         
         if name then
           output_stream.puts "#{record[name]}"

data/lib/priam/core/common.rb

@@ -16,6 +16,7 @@ module Priam::Core
       
       json_flag = false
       verbose_flag = false
+      with_key_flag = false
       
       next_argv = []
       
@@ -56,6 +57,8 @@ module Priam::Core
           json_flag = true
         when '--verbose'
           verbose_flag = true
+        when '--with-key'
+          with_key_flag = true
         else 
           next_argv.push val
         end
@@ -85,7 +88,8 @@ module Priam::Core
         :output_keys_flag=>output_keys_flag,
         :replication_factor=>replication_factor,
         :json_flag=>json_flag,
-        :verbose_flag=>verbose_flag
+        :verbose_flag=>verbose_flag,
+        :with_key_flag=>with_key_flag
       }
     end
   end

data/priam.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "priam"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kenji Hara"]
-  s.date = "2013-01-01"
+  s.date = "2013-02-25"
   s.description = "Command-base client for Cassandra."
   s.email = "haracane@gmail.com"
   s.executables = ["priam"]

data/spec/bin/priam_spec.rb

@@ -92,11 +92,22 @@ describe "bin/priam" do
   
   context "when command = get" do
     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"}'
+      context "with with-key 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 "without with-key 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 --with-key --verbose #{@stderr_dst}`
+            result.chomp!
+            result.should == ["key1", '{"d":"val1"}'].join("\t")
+          end
         end
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: priam
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Kenji Hara
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-01 00:00:00 Z
+date: 2013-02-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false