cassie 1.1.5 → 1.1.6.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9ccfed850a04525540b907377c45bc184fc2b29
-  data.tar.gz: 4c7fc37a9271510ffbae658d630142f67c7a8209
+  metadata.gz: 7257a6f02ed7e3fe15e51332ba3a7eabbaf0c368
+  data.tar.gz: 3129c8b2c54ecb809e35dee8cc7447c8b983ee5a
 SHA512:
-  metadata.gz: ec535d27f438aae219169b0ef714dcedd28eb055d74c0c6ef388c4101433a543d5d03aa157e14e765b2cad0062b6538650738627d75d362eb1eb7daf05d46675
-  data.tar.gz: 2e0853ebe696698f137b83bd06366bca34f7bd9c713ccb42f93c7a6e5fdaeea8b6f7964fb0b5f0f31b46083ddb992a040de62b8c8a8bc3574197c29ac1933ad1
+  metadata.gz: dd25023715242ec4d9a6b97383229c9b4f1b5bb89cc4408fde3d33ee6648147691f09c126a5ae258eceb72208683e2a7a3172e9a2a7011eccf1133e0e8847696
+  data.tar.gz: d1abfcb2272ceffa2ad265cefe2543aeab8b94ced10deefa1277bd1f560efe17c5e7dbc99e18b15bfc00579be1ddfb04c645420081a8ae805b9cbaa338418f72

data/lib/cassie/statements/README.md

@@ -215,7 +215,7 @@ query.execute
 #=> true
 ```
 
-Mapping assignemtnt values from a domain object is supported.
+Mapping assignment values from a domain object is supported.
 
 ```ruby
 class UpdateUserQuery < Cassandra::Modification
@@ -270,41 +270,6 @@ user
 UpdateUserQuery.new(user: user).execute
 ```
 
-<pre><b>
-(1.2ms) UPDATE users_by_id (phone, email, address, username) VALUES (?, ?, ?, ?) WHERE id = ?; [["+15555555555", "etp@example.com", nil, "etp", 6539]]
-</b></pre>
-
-The above examples use positional terms (e.g. the term is '?' in the statement). The assignement's term can be defined explicitly.
-
-```ruby
-insert_into :posts
-
-set :id, term: "now()"
-```
-
-```ruby
-update :post_counts
-
-set :comments_count, "comments_count + 1"
-
-non_idempotent
-```
-
-A value will be fetched and placed as an argument in the statement if the provided term includes a positional marker ('?').
-
-```ruby
-select :posts
-
-where :id, :gteq, term: "minTimeuuid(?)", value: :window_min_timestamp
-
-def window_min_timestamp
-  '2013-02-02 10:00+0000'
-end
-```
-
-> Note: The `term` option should be used with care. Using it innapropriately could result in inefficient use of prepared statements, and/or leave you potentially vulnerable to injection attacks.
-
-
 #### Column Selection (`select`)
 
 By default, all columns will be selected (e.g. '*'). Specify a column for selection with `select`.
@@ -374,6 +339,59 @@ By default, all columns for specified CQL rows will be deleted. Identify a subse
 #=> DELETE nickname FROM authors_by_id where id = 123;
 ```
 
+#### Non-Positional Terms
+
+<pre><b>
+(1.2ms) UPDATE users_by_id (phone, email, address, username) VALUES (?, ?, ?, ?) WHERE id = ?; [["+15555555555", "etp@example.com", nil, "etp", 6539]]
+</b></pre>
+
+BY default, Cassie uses positional terms as shown in this update statement (e.g. the term is '?' in the statement). The assignement's term can also be defined explicitly.
+
+```ruby
+insert_into :posts
+
+set :id, term: "now()"
+```
+<pre><b>
+(1.2ms) INSERT into posts_by_id (id) VALUES (now());
+</b></pre>
+
+```ruby
+update :post_counts
+
+set :comments_count, "comments_count + 1"
+
+non_idempotent
+```
+
+A value will be fetched and placed as an argument in the statement if the provided term includes a positional marker ('?').
+
+```ruby
+select :posts
+
+where :id, :gteq, term: "minTimeuuid(?)", value: :window_min_timestamp
+
+def window_min_timestamp
+  '2013-02-02 10:00+0000'
+end
+```
+
+> Note: The `term` option should be used with care. Using it innapropriately could result in inefficient use of prepared statements, and/or leave you potentially vulnerable to injection attacks.
+
+#### Setting Column TTL and Timestamp (`using`)
+
+```ruby
+class InsertSessionQuery < Cassandra::Modification
+
+  insert :sessions_by_token
+
+  set :token
+  set :username
+
+  using ttl: 300, if: :expiring?
+end
+```
+
 #### Execution and Result
 
 Executing a `Cassie::Query` populates the `result` attribute.

data/lib/cassie/support/system_command.rb

@@ -3,17 +3,93 @@ module Cassie
     class SystemCommand
       attr_reader :binary, :args, :command, :status, :duration, :output
 
-      # When a block is given, the command runs before yielding
-      def initialize(binary, args=[])
-        @binary = binary
-        @args = args
-        @command = (Array(binary) + args).join(" ")
-        @command = command + " 2>&1" unless command =~ / > /
+      # Indicates whether a binary exists in the current user's PATH
+      # @param [String, Symbol] name the name of the command to search for
+      # @return [Boolean] true if the binary could be found
+      def self.exist?(name)
+        !!which(name)
+      end
 
-        if block_given?
-          run
-          yield self
+      # Find the path to the executable file, using the current user's PATH
+      # @param [String, Symbol] name the name of the command to search for
+      # @return [String, nil] the fully qualified path
+      def self.which(name)
+        # windows support
+        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+          exts.each { |ext|
+            exe = File.join(path, "#{name}#{ext}")
+            return exe if File.executable?(exe) && !File.directory?(exe)
+          }
         end
+        return nil
+      end
+
+      # Creates a new SystemCommand object that has
+      # not yet been executed.
+      #
+      # @overload initialize(command)
+      #   @param [#to_s] the command to execute
+      #
+      # @overload initialize(binary, [args]=[])
+      #   @param [#to_s] binary the binary to be called
+      #   @param [Array<#to_s>] args Arguments to be passed to the binary
+      #
+      # @overload initialize(binary, arg, ...)
+      #   @param [#to_s] binary the binary to be called
+      #   @param [#to_s, Array<#to_s>] arg Argument(s) to be passed to the binary
+      #   @param [#to_s, Array<#to_s>] ... more argument(s) to be passed to the binary
+      #
+      # @example command string
+      #   cmd = SystemCommand.new("git reset --hard HEAD")
+      #   cmd.binary
+      #   #=> "git"
+      #   cmd.args
+      #   #=> ["reset", "--hard", "HEAD"]
+      #
+      # @example binary and arguments strings
+      #   cmd = SystemCommand.new("git", "reset --hard HEAD")
+      #   cmd.binary
+      #   #=> "git"
+      #   cmd.args
+      #   #=> ["reset", "--hard", "HEAD"]
+      #
+      # @example binary and arguments string with splat
+      #   cmd = SystemCommand.new("git", "reset", "--hard HEAD")
+      #   cmd.binary
+      #   #=> "git"
+      #   cmd.args
+      #   #=> ["reset", "--hard", "HEAD"]
+      #
+      # @example binary with arguments array
+      #   cmd = SystemCommand.new("git", ["reset", "--hard", "HEAD"])
+      #   cmd.binary
+      #   #=> "git"
+      #   cmd.args
+      #   #=> ["reset", "--hard", "HEAD"]
+      #
+      # @example array
+      #   cmd = SystemCommand.new(["git", "reset", "--hard", "HEAD"])
+      #   cmd.binary
+      #   #=> "git"
+      #   cmd.args
+      #   #=> ["reset", "--hard", "HEAD"]
+      def initialize(*cmd)
+        @args = []
+        cmd.flatten.each{|a| @args += a.to_s.split(" ")}
+
+        @command = args.join(" ")
+        @command = command + " 2>&1" unless command =~ / > /
+
+        @binary = @args.shift
+      end
+
+      def exist?
+        self.class.exist?(binary)
+      end
+
+      def which
+        self.class.which(binary)
       end
 
       # Runs the command
@@ -22,8 +98,8 @@ module Cassie
         t1=Time.now
 
         IO.popen(command) do |io|
-          @output=io.read
           @status=Process.waitpid2(io.pid)[1]
+          @output=io.read.sub(/\n\z/, "")
         end
 
         @duration=Time.now-t1

data/lib/cassie/version.rb

@@ -1,3 +1,3 @@
 module Cassie
-  VERSION = "1.1.5"
+  VERSION = "1.1.6.pre2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassie
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6.pre2
 platform: ruby
 authors:
 - Evan Prothro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
@@ -269,9 +269,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2