cassie 1.0.0.beta.17 → 1.0.0.beta.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71a12665eb2a25e213efec94104b89596b73de6e
-  data.tar.gz: eee311ddf38fec5e650df34c1dcedb37b7cf484d
+  metadata.gz: 44bcb0d0fb09b42a535b4e22a6bbc2b54a92af9a
+  data.tar.gz: 20a5acd5604630f500c9b06ba15804be0e9acf54
 SHA512:
-  metadata.gz: 3fccb0986e571367523a1e5406116378ca8b524cb90ffcc81f682b513f6bfeead507488224360335ccd498830df4bf63ab7d12748b0d0f642bb61f88c75a87af
-  data.tar.gz: 95f0cb88169afc469aea4e0ec159d065141864837f0ef0752136329e8b445192ec6fa00321bc5280d3c6af6f14e222b934d6230e3538d9e71bfa85815c38dabc
+  metadata.gz: 18b4e938a675a39a79e63c1dcc6477941a26ac880c077cb4254533f358ceda7acbeff1df015b123652e87c4a1ca19c02d13c7e461dd9acc7e48c5b7b6f64bc17
+  data.tar.gz: 1dcd53f870f9ff37b0878922021648e9b8973b1126f7142dadd4a957fb22f5f9d4c74bd74035d7965958d60c42b623b27d0ce47fb3bf522b9aa50c76e8169795

data/bin/cassie

@@ -15,30 +15,36 @@ def start
   end
 end
 
-def stop
+def stop(kill_all=false)
   runner = Cassie::Support::CommandRunner.new("ps", ["-awx"])
   runner.run!
  # | grep cassandra | grep -v grep | awk '{print $1}'`
   cassandra_awx = runner.output.split("\n").grep(/cassandra/)
-  pid = case cassandra_awx.length
-  when 0
+  pids = cassandra_awx.map{ |p| p.split(' ').first.to_i }
+
+  if pids.empty?
     puts red("No Cassandra process was found. Is Cassandra running?")
     exit(1)
-  when 1
-    cassandra_awx.first.split(' ').first.to_i
-  else
-    puts red("Couldn't single out a Cassandra process:\n#{cassandra_awx}")
+  elsif pids.length > 1 && !kill_all
+    puts red("Couldn't single out a Cassandra process.")
+    puts red("  - Is cqlsh running?")
+    puts red("  - Kill all cassandra processes with --all")
+    cassandra_awx.each do |p|
+      puts "    - #{p.split(' ').first.ljust(5,' ')} | #{p.split(' ').last}"
+    end
     exit(1)
   end
 
   puts("Stopping Cassandra...")
-  Process.kill("TERM", pid)
-  loop do
-    sleep(0.1)
-    begin
-      Process.getpgid( pid )
-    rescue Errno::ESRCH
-      break
+  pids.each do|pid|
+    Process.kill("TERM", pid)
+    loop do
+      sleep(0.1)
+      begin
+        Process.getpgid( pid )
+      rescue Errno::ESRCH
+        break
+      end
     end
   end
 
@@ -85,6 +91,20 @@ def dump_structure
   puts "[✓] Cassandra schema written to #{opts[:destination_path]}"
 end
 
+def tail_log
+  runner = Cassie::Support::CommandRunner.new("which", ["cassandra"])
+  runner.run!
+
+  bin_path = runner.output.gsub("\n", '')
+  log_path = bin_path.sub('bin/cassandra', 'logs/system.log')
+  puts white("Tailing Cassandra system log, Ctrl-C to stop...")
+  puts "  #{log_path}:\n\n"
+
+  args = ['-f', log_path, '>', '/dev/tty']
+  runner = Cassie::Support::CommandRunner.new("tail", args)
+  runner.run!
+end
+
 def load_structure
   opts = {}
   opts[:source_path] = Cassie.paths[:schema_structure]
@@ -97,6 +117,9 @@ def load_structure
   puts "[✓] Cassandra schema loaded from #{opts[:source_path]}"
 end
 
+def white(message)
+  "\e[1;37m#{message}\e[0m"
+end
 def red(message)
   "\e[1;31m#{message}\e[0m"
 end
@@ -108,9 +131,11 @@ case ARGV[0]
 when "start"
   start
 when "stop"
-  stop
+  stop(ARGV.include?('--all'))
 when /kick|restart/
   kick
+when /tail|log/
+  tail_log
 when "configuration:generate"
   generate_config
 when "structure:dump"

data/lib/cassie/configuration/templates/cassandra.yml

@@ -9,14 +9,13 @@ development:
   hosts:
     - 127.0.0.1
   port: 9042
-  reconnection_policy: <%%= Cassandra::Reconnection::Policies::Exponential.new(0.5, 60, 2) %>
   keyspace: <%=app_name%>_development
 
 test:
   hosts:
     - 127.0.0.1
   port: 9042
-  idle_timeout: nil
+  idle_timeout: null
   keyspace: <%=app_name%>_test
 
 production:

data/lib/cassie/connection.rb

@@ -1,7 +1,7 @@
 module Cassie
-  #TODO: proper rdoc
-  # include to give #session and #keyspace
-  # convenience methods
+  # Include Cassie::Connection to add #session and #keyspace
+  # convenience methods that conform with object cacheing and reuse
+  # behavior in line with Cassandra best practices
   module Connection
 
     extend ActiveSupport::Concern

data/lib/cassie/connection_handler/cluster.rb

@@ -21,7 +21,7 @@ module Cassie::ConnectionHandler
           _cluster = Cassandra.cluster(config)
         end
 
-        logger.info "(#{(sec/1000.0).round(2)}ms) Connected to Cassandra cluster #{config[:hosts]}"
+        logger.info "(#{(sec*1000).round(2)}ms) Connected to Cassandra cluster #{config[:hosts]}"
         _cluster
       end
     end

data/lib/cassie/connection_handler/sessions.rb

@@ -20,7 +20,7 @@ module Cassie::ConnectionHandler
         _session = cluster.connect(_keyspace)
       end
 
-      logger.info "(#{(sec/1000.0).round(2)}ms) Session opened to Cassandra[#{_keyspace}]"
+      logger.info "(#{(sec*1000).round(2)}ms) Session opened to Cassandra[#{_keyspace}]"
       @sessions[_keyspace] = _session
     end
   end

data/lib/cassie/connection_handler.rb

@@ -1,6 +1,8 @@
 module Cassie
-  #TODO: proper rdoc
-  # Assumes module responds to `configuration`, `keyspace`, and `cluster`
+  # Extend Cassie::ConnectionHandler to provide cluster and session
+  # cacheing in line with Cassandra best practices.
+  #
+  # The base class must implement `configuration` and `keyspace` methods.
   module ConnectionHandler
     require_relative 'connection_handler/cluster'
     require_relative 'connection_handler/sessions'

data/lib/cassie/definition.rb

@@ -0,0 +1,8 @@
+module Cassie
+  class Definition
+    require_relative 'statements'
+
+    include Cassie::Connection
+    include Statements::Core
+  end
+end

data/lib/cassie/modification.rb

@@ -0,0 +1,9 @@
+module Cassie
+  class Modification
+    require_relative 'statements'
+
+    include Cassie::Connection
+    include Statements::Core
+    include Statements::Modification
+  end
+end

data/lib/cassie/query.rb

@@ -1,22 +1,10 @@
 module Cassie
-  module Queries
-  end
   class Query
-    require_relative 'queries/statement'
-    require_relative 'queries/instrumentation'
-    require_relative 'queries/logging'
+    require_relative 'statements'
 
     include Cassie::Connection
-    include Queries::Statement
-    include Queries::Instrumentation
-    include Queries::Logging
-
-    def initialize(params={})
-      params.each do |attr, value|
-        self.public_send("#{attr}=", value)
-      end
+    include Statements::Core
+    include Statements::Query
 
-      super()
-    end
   end
 end