priam 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/priam

@@ -13,10 +13,12 @@ when "delete"
   exit_code = Priam::Command::Delete.run(ARGV) || 0
 when "get"
   exit_code = Priam::Command::Get.run(ARGV) || 0
-when "put"
-  exit_code = Priam::Command::Put.run(ARGV) || 0
+when "help"
+  exit_code = Priam::Command::Help.run(ARGV) || 0
 when "insert"
   exit_code = Priam::Command::Insert.run(ARGV) || 0
+when "put"
+  exit_code = Priam::Command::Put.run(ARGV) || 0
 else
   STDERR.puts "Invalid command: '#{command}'"
   exit_code = 1

data/lib/priam/command/get.rb

@@ -7,7 +7,7 @@ module Priam::Command
       keyspace = params[:keyspace]
       column_family = params[:column_family]
       super_column = params[:super_column]
-      name = params[:name]
+      name = params[:value_column]
 
       client = Cassandra.new(keyspace, "#{host}:#{port}")
       

data/lib/priam/command/help.rb

@@ -0,0 +1,25 @@
+module Priam::Command
+  module Help
+    def self.run(argv, input_stream=$stdin, output_stream=$stdout)
+      output_stream.puts <<-EOF
+usage: priam COMMAND [-h HOST] [-p PORT]
+            [--keyspace KEYSPACE] [--column-family COLUMN_FAMILY]
+            [--super-column SUPER_COLUMN] [--value-column COLUMN_NAME]
+            [--retry COUNT] [--weight MSEC]
+            [--raise-exception] [--unit-size COUNT] [--verbose]
+  -h HOST                        cassandra server address. default is localhost. 
+  -p PORT                        port number. default is 9160.
+  --keyspace KEYSPACE            keyspace.
+  --column-family COLUMN_FAMILY  column-family.
+  --super-column SUPER_COLUMN    super-column.
+  --value-column COLUMN_NAME     column name for each column.
+  --retry COUNT                  max retry count for put/get.
+  --weight MSEC                  weight time for retry.
+  --raise-exception              raise exception.
+  --unit-size COUNT              unit size for log.
+  --verbose                      turn on verbose output, with all the available data.
+      EOF
+      return 0
+    end
+  end
+end

data/lib/priam/command.rb

@@ -4,6 +4,7 @@ end
 require "priam/command/cql"
 require "priam/command/delete"
 require "priam/command/get"
+require "priam/command/help"
 require "priam/command/insert"
 require "priam/command/put"
 

data/lib/priam/core/common.rb

@@ -71,10 +71,10 @@ module Priam::Core
         :keyspace=>keyspace,
         :column_family=>column_family,
         :super_column=>super_column,
-        :name=>name,
+        :name=>name || value_column,
         :raise_exception_flag=>raise_exception_flag,
         :unit_size=>unit_size,
-        :value_column=>value_column,
+        :value_column=>value_column || name,
         :weight_second=>weight_second,
         :retry_max_count=>retry_max_count,
         :count_log_path=>count_log_path,

data/priam.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "priam"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kenji Hara"]
-  s.date = "2012-12-12"
+  s.date = "2012-12-16"
   s.description = "Command-base client for Cassandra."
   s.email = "haracane@gmail.com"
   s.executables = ["priam"]
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "lib/priam/command/cql/create.rb",
     "lib/priam/command/delete.rb",
     "lib/priam/command/get.rb",
+    "lib/priam/command/help.rb",
     "lib/priam/command/insert.rb",
     "lib/priam/command/put.rb",
     "lib/priam/core.rb",
@@ -51,7 +52,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/haracane/priam"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.21"
+  s.rubygems_version = "1.8.17"
   s.summary = "Command-base client for Cassandra."
 
   if s.respond_to? :specification_version then

data/spec/bin/priam_spec.rb

@@ -34,6 +34,13 @@ describe "bin/priam" do
     end
   end
   
+  context "when command = help" do
+    it "should output help" do
+      result = `#{Priam::RUBY_CMD} -I #{Priam::LIB_DIR} #{Priam::BIN_DIR}/priam help`
+      result.length.should > 0
+    end
+  end
+  
   context "when command = insert" do
     it "should insert values" do
       input = [

data/spec/spec_helper.rb

@@ -45,7 +45,7 @@ create column family PriamCF
     tmpfile.puts cql
     tmpfile.close
     hostname = `hostname`.chomp
-    `echo "#{cql}" /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}`
     tmpfile.unlink
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: priam
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Kenji Hara
@@ -15,9 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-12 00:00:00 Z
+date: 2012-12-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: thrift
+  prerelease: false
   type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -31,9 +33,9 @@ dependencies:
         - 0
         version: 0.7.0
   version_requirements: *id001
-  name: thrift
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: thrift_client
+  prerelease: false
   type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,9 +49,9 @@ dependencies:
         - 1
         version: 0.7.1
   version_requirements: *id002
-  name: thrift_client
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: simple_uuid
+  prerelease: false
   type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -63,9 +65,9 @@ dependencies:
         - 0
         version: 0.2.0
   version_requirements: *id003
-  name: simple_uuid
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: cassandra
+  prerelease: false
   type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -79,9 +81,9 @@ dependencies:
         - 1
         version: 0.12.1
   version_requirements: *id004
-  name: cassandra
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
   type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -95,9 +97,9 @@ dependencies:
         - 0
         version: 2.8.0
   version_requirements: *id005
-  name: rspec
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
   type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -110,9 +112,9 @@ dependencies:
         - 12
         version: "3.12"
   version_requirements: *id006
-  name: rdoc
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
   type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -126,9 +128,9 @@ dependencies:
         - 0
         version: 1.0.0
   version_requirements: *id007
-  name: bundler
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
   type: :development
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -142,9 +144,9 @@ dependencies:
         - 4
         version: 1.8.4
   version_requirements: *id008
-  name: jeweler
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
   type: :development
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -156,8 +158,6 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id009
-  name: rcov
-  prerelease: false
 description: Command-base client for Cassandra.
 email: haracane@gmail.com
 executables: 
@@ -183,6 +183,7 @@ files:
 - lib/priam/command/cql/create.rb
 - lib/priam/command/delete.rb
 - lib/priam/command/get.rb
+- lib/priam/command/help.rb
 - lib/priam/command/insert.rb
 - lib/priam/command/put.rb
 - lib/priam/core.rb
@@ -226,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Command-base client for Cassandra.