cassie 1.0.0.beta.22 → 1.0.0.beta.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 535c984598050fbd5ac382820afbc887b1fd57f5
-  data.tar.gz: 7f1a97fc63a2a53b4947c5f2e0ef43bcdfb594a2
+  metadata.gz: 65b5763101f92f5797356a1081e0fee0219cd86a
+  data.tar.gz: ff6994cee1c3f6d04d4ff35f01bd2e59e4d50ac5
 SHA512:
-  metadata.gz: e627d882bdd46544ccd753fd5b215c6fbb02d913311e3e982b3e4451039b209420d030fcd2fbd0de08bf1dd8da56a56edc74f7b867318381c1296fd392f87df9
-  data.tar.gz: 7f3eed69154aad5ed58fb1463274977462335deaa605fdec9afda5a223f7b213072ac8f1faf76a17a545e5a0539bab46325604fe9155faa0402dc9bf1afa061c
+  metadata.gz: 77986c9aeb90d02ef1fdb107d168312390099ac0094ebef092985b737436f7ad5f23ce97f5068e4b0ca27579431fed9d7c95a426318b4008052dd5c9ebbe1b60
+  data.tar.gz: 961f2603659b2d3a770425fa571ea715ebe12314b602cd21539af579fcd48b0ff48a11aaf45d3304c3ca2211ed0a27303f6b36b76972d64782eac0637470baab

data/bin/cassie

@@ -5,7 +5,7 @@ def start
   runner = Cassie::Support::CommandRunner.new("cassandra")
   puts("Starting Cassandra...")
   runner.run
-  runner.fail unless runner.finished?
+  runner.fail unless runner.completed?
 
   if runner.output =~ /state jump to NORMAL/
     puts "[#{green('✓')}] Cassandra Running"
@@ -17,8 +17,9 @@ end
 
 def stop(kill_all=false)
   runner = Cassie::Support::CommandRunner.new("ps", ["-awx"])
-  runner.run!
- # | grep cassandra | grep -v grep | awk '{print $1}'`
+  runner.run
+  fail runner.failure_message unless runner.success?
+
   cassandra_awx = runner.output.split("\n").grep(/cassandra/)
   pids = cassandra_awx.map{ |p| p.split(' ').first.to_i }
 
@@ -75,20 +76,23 @@ def generate_config
 end
 
 def dump_structure
-  opts = {}
-  opts[:destination_path] = Cassie.paths[:schema_structure]
+  dumper = Cassie::Migration::StructureDumper.new
+  dumper.dump
+  puts "[#{green("✓")}] Cassandra schema written to #{dumper.destination_path}"
 
-  args = ["-e", "'DESCRIBE SCHEMA'"]
+rescue => e
+  puts e.message
+  exit(1)
+end
 
-  runner = Cassie::Support::CommandRunner.new("cqlsh", args)
-  runner.run!
+def load_structure
+  loader = Cassie::Migration::StructureLoader.new
+  loader.load
+  puts "[#{green("✓")}] Cassandra schema loaded from #{loader.source_path}"
 
-  dir = File.dirname(opts[:destination_path])
-  Dir.mkdir(dir) unless File.directory?(dir)
-  File.open(opts[:destination_path], "w+") do |f|
-    f.write(runner.output)
-  end
-  puts "[✓] Cassandra schema written to #{opts[:destination_path]}"
+rescue => e
+  puts e.message
+  exit(1)
 end
 
 def tail_log
@@ -105,16 +109,44 @@ def tail_log
   runner.run!
 end
 
-def load_structure
-  opts = {}
-  opts[:source_path] = Cassie.paths[:schema_structure]
+# Use current schema to initialize versioned migrations
+#   * import current schema as initial migration
+#   * initialize cassie_schema keyspace and version table
+#   * insert initial version
+#   * dump structure
+def initialize_migrations
+  Cassie::Migration.initialize_versioning
+  puts "[#{green("✓")}] Versioned migrations initialized. Current version: #{Cassie::Migration.version_number}"
+rescue Cassie::Migration::AlreadyInitiailizedError
+  puts "[#{red('✘')}] Versioned migration metatdata already exists. Current version: #{Cassie::Migration.version_number}"
+rescue => e
+  puts e.message
+  exit(1)
+end
 
-  args = ["-f", opts[:source_path]]
+def schema_history
+  print_versions(Cassie::Migration.versions)
+rescue Cassie::Migration::UninitializedError => e
+  puts red(e.message)
+end
 
-  runner = Cassie::Support::CommandRunner.new("cqlsh", args)
-  runner.run!
+def schema_version
+  print_versions([Cassie::Migration.version])
+rescue Cassie::Migration::UninitializedError => e
+  puts red(e.message)
+end
 
-  puts "[✓] Cassandra schema loaded from #{opts[:source_path]}"
+def print_versions(versions)
+  require 'terminal-table'
+  members = [:version_number, :description, :migrator, :migrated_at]
+  titles  = ['Version', 'Description', 'Migrated by', 'Migrated at']
+  table = Terminal::Table.new(headings:  titles)
+  versions.each.with_index do |v, i|
+    v.version_number = "* #{v.version_number}" if i == 0
+    table.add_row(v.to_h.values_at(*members))
+  end
+  table.align_column(0, :right)
+  puts table
 end
 
 def white(message)
@@ -142,6 +174,12 @@ when "structure:dump"
   dump_structure
 when "structure:load"
   load_structure
+when /migrations?\:initialize/
+  initialize_migrations
+when "schema:history"
+  schema_history
+when "schema:version"
+  schema_version
 else
   puts red("`#{ARGV[0]}` is not a supported command.")
 end

data/lib/cassie/configuration/core.rb

@@ -10,7 +10,6 @@ module Cassie::Configuration
 
     def self.extended(extender)
       extender.paths["cluster_configurations"] = "config/cassandra.yml"
-      extender.paths["schema_structure"] = "db/structure.cql"
     end
 
     def env
@@ -31,7 +30,7 @@ module Cassie::Configuration
 
     def configurations=(val)
       if val && defined?(@configuration)
-        puts "WARNING:\n `#{self}.configuration` as been set explicitly. Setting `configurations` will have no effect."
+        puts "WARNING: Setting `configurations` will have no effect on what config is used right now. `#{self}.configuration` has previously been set explicitly and will be used instead."
       end
       @configurations = val
     end

data/lib/cassie/migration/README.md

@@ -0,0 +1,141 @@
+# Cassie Migrations
+
+Cassie provides versioned migrations similar to many existing adapters and frameworks.
+
+Practically speaking, this gives your cluster schmea its own "version" and simplifies upgrading or downgrading the schema.
+
+As such, Cassie uses semantic versioning, where a defined version describes all non-system keyspaces.
+
+Major, minor, and patch versions are used, without support for semantic extensions (prerelase or metadata, ex: 1.0.0.beta).
+
+### Schema Migrations
+#### Creating a migration
+
+```
+cassie migration:create that_killer_feature --bump minor
+=> 0.2.0 - migrations/000_002_000_that_killer_feature.rb
+```
+
+```ruby
+# migrations/000_002_000_that_killer_feature.rb
+
+Uses the excellend DSL from `cassandra_migrations`.
+```
+
+#### Executing migrations
+
+```
+cassie migrate
+=> roll up to latest version
+```
+
+```
+cassie migrate 0.2.0
+=> roll up to 0.2.0 and stop
+```
+
+```
+cassie migrate 0.1.9
+=> roll back to 0.1.9 and stop
+```
+
+#### Rolling back
+
+```
+cassie rollback
+=> roll back 1 version and stop
+```
+
+```
+cassie rollback 3
+=> roll back 3 versions and stop
+```
+
+#### Getting the current version
+```
+cassie schema:version
++---------+----------------+-------------+---------------------------+
+| Version | Description    | Migrated by | Migrated at               |
++---------+----------------+-------------+---------------------------+
+| * 0.1.0 | initial schema | eprothro    | 2016-09-08 09:23:54 -0500 |
++---------+----------------+-------------+---------------------------+
+```
+
+#### Getting the version history
+```
+cassie schema:history
++---------+----------------+-------------+---------------------------+
+| Version | Description    | Migrated by | Migrated at               |
++---------+----------------+-------------+---------------------------+
+| * 0.2.0 |  create users  | serverbot   | 2016-09-08 10:23:54 -0500 |
+| * 0.1.0 | initial schema | eprothro    | 2016-09-08 09:23:54 -0500 |
++---------+----------------+-------------+---------------------------+
+```
+
+### Data Migrations
+
+####TODO:
+
+Best practice is calling data massaging from the migration, implemented with nice OO elsewhere...
+
+### Schema overrides per environment
+
+####TODO:
+
+Migrations define production use case. Development and/or testing use cases may have slightly different needs.
+
+Configure keyspace and/or table properties per env that should override migrations.
+
+Example of keyspace replication settings.
+
+Make sure it is clear what the schema dump is (with or without overrides)
+
+### Multiple Keyspaces
+
+####TODO:
+
+Don't agree with different ENVs for managing multiple keyspaces. That assumes keyspaces align with domains.
+
+Example of counter tables in a separate keyspace for higher replication to make read pressure lower.
+
+Manage multiple keyspaces in configruation.
+
+Configuration defaults to simple replication with durable writes.
+
+Example of changing replication for production and how overrides keep dev working.
+
+### Application Growth
+
+####TODO:
+
+This works for starting out, single app, single dev.
+
+This also scales well to multiple apps or microservices, and multiple teams (ops, etc.), managing and depending on a central repository of migrations with a semantically versioned database schema.
+
+### Transitioning from Other Tools
+
+####TODO:
+
+Support for sucking in `cassandra_migrations` migration files and changing to semantic versioning.
+
+```
+cassie migration:import cassandra_migrate
+=> 0.0.1 - cassandra_migrate/20160818213805_create_users.rb -> migrations/000_000_001_create_users.rb
+=> 0.0.2 - cassandra_migrate/20160818213811_create_widgets.rb -> migrations/000_000_002_create_widgets.rb
+=> 0.0.3 - cassandra_migrate/20160818213843_create_sprockets.rb -> migrations/000_000_003_create_sprockets.rb
+3 migrations imported
+```
+
+Support for a .cdl migration file to act as initial migration (dump defining initial version).
+
+```
+cassie migration:initialize
+=> 0.1.0 - migrations/000_001_000_initial_schema.cdl
+schema initialized at v0.1.0 from current database structure
+```
+
+```
+cassie migration:initialize 0.15.3
+=> 0.1.0 - migrations/000_015_003_initial_schema.cdl
+schema initialized at v0.15.3 from current database structure
+```

data/lib/cassie/migration/configuration.rb

@@ -0,0 +1,18 @@
+module Cassie::Migration
+  # Extend a module/class with Configuration to enable migration management
+  module Configuration
+
+    attr_accessor :schema_keyspace,
+                  :versions_table
+
+    def self.extended(extender)
+      extender.paths["schema_structure"] = "db/structure.cql"
+      extender.schema_keyspace = "cassie_schema"
+      extender.versions_table = "versions"
+    end
+
+    def paths
+      @paths ||= {}.with_indifferent_access
+    end
+  end
+end

data/lib/cassie/migration/initialization.rb

@@ -0,0 +1,70 @@
+module Cassie::Migration
+
+  class AlreadyInitiailizedError < StandardError; end
+  class UninitializedError < StandardError; end
+
+  module Initialization
+    require 'etc'
+
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+
+      def initialize_versioning(version=default_version)
+        create_schema_keyspace unless keyspace_exists?
+        raise Cassie::Migration::AlreadyInitiailizedError if version_exists?
+        create_versions_table unless versions_table_exists?
+        insert_version(build_version(version, 'initial schema'))
+      end
+
+      def keyspace_exists?
+        Cassie.cluster.keyspaces.map(&:name).any?{|k| k == Cassie::Migration.schema_keyspace}
+      end
+
+      def version_exists?
+        !!Cassie::Migration.version
+      rescue Cassie::Migration::UninitializedError
+        false
+      end
+
+      def versions_table_exists?
+        !!SelectVersionsQuery.new(limit: 1).fetch
+      rescue Cassandra::Errors::InvalidError
+        false
+      end
+
+      def build_version(version_number, description)
+        id = Cassandra::TimeUuid::Generator.new.now
+        migrator = Etc.getlogin rescue '<unknown>'
+        migrated_at = Time.now
+        Version.new(id, version_number, description, migrator, migrated_at)
+      end
+
+      def insert_version(version)
+        InsertVersionQuery.new(version: version).execute
+      end
+
+      protected
+
+      def default_version
+        '0.1.0'
+      end
+
+      def create_schema_keyspace
+        CreateSchemaKeyspaceQuery.new.execute
+      end
+
+      def create_versions_table
+        CreateVersionsTableQuery.new.execute
+      end
+
+      def uninitialized_error
+        UninitializedError.new(uninitialized_message)
+      end
+
+      def uninitialized_message
+        "Cassie Schema Versions table not found at '#{schema_keyspace}.#{versions_table}'. Create a migration or initialize your schema to enable versioned migration support."
+      end
+    end
+  end
+end

data/lib/cassie/migration/queries/create_schema_keyspace_query.rb

@@ -0,0 +1,17 @@
+module Cassie::Migration
+  class CreateSchemaKeyspaceQuery < Cassie::Definition
+    self.prepare = false
+
+    def statement
+      cql = %(
+        CREATE KEYSPACE #{Cassie::Migration.schema_keyspace}
+        WITH replication = {'class': 'SimpleStrategy', 'replication_factor': '1'}
+        AND durable_writes = true;
+       )
+    end
+
+    def keyspace
+      nil
+    end
+  end
+end

data/lib/cassie/migration/queries/create_versions_table_query.rb

@@ -0,0 +1,23 @@
+module Cassie::Migration
+  class CreateVersionsTableQuery < Cassie::Definition
+    self.prepare = false
+
+    def statement
+      %(
+         CREATE TABLE #{Cassie::Migration.versions_table} (
+           bucket int,
+           id timeuuid,
+           version_number text,
+           description text,
+           migrator text,
+           migrated_at timestamp,
+           PRIMARY KEY (bucket, id)
+         ) WITH CLUSTERING ORDER BY (id DESC);
+        )
+    end
+
+    def keyspace
+      Cassie::Migration.schema_keyspace
+    end
+  end
+end

data/lib/cassie/migration/queries/insert_version_query.rb

@@ -0,0 +1,23 @@
+module Cassie::Migration
+  class InsertVersionQuery < Cassie::Modification
+
+    insert_into Cassie::Migration.versions_table
+
+    set :bucket
+    set :id
+    set :version_number
+    set :description
+    set :migrator
+    set :migrated_at
+
+    map_from :version
+
+    def bucket
+      0
+    end
+
+    def keyspace
+      Cassie::Migration.schema_keyspace
+    end
+  end
+end

data/lib/cassie/migration/queries/select_versions_query.rb

@@ -0,0 +1,14 @@
+module Cassie::Migration
+  class SelectVersionsQuery < Cassie::Query
+
+    select_from Cassie::Migration.versions_table
+
+    def build_result(row)
+      Version.new(*row.values_at(*Version.members.map(&:to_s)))
+    end
+
+    def keyspace
+      Cassie::Migration.schema_keyspace
+    end
+  end
+end

data/lib/cassie/migration/queries.rb

@@ -0,0 +1,8 @@
+module Cassie::Migration
+  module Queries
+    require_relative 'queries/create_schema_keyspace_query'
+    require_relative 'queries/create_versions_table_query'
+    require_relative 'queries/insert_version_query'
+    require_relative 'queries/select_versions_query'
+  end
+end

data/lib/cassie/migration/structure_dumper.rb

@@ -0,0 +1,94 @@
+module Cassie::Migration
+  require_relative 'queries'
+
+  class StructureDumper
+    attr_reader :destination_path
+
+    def initialize(opts={})
+      @destination_path = opts[:destination_path] || default_destination_path
+    end
+
+    def stream
+      @stream ||= begin
+        prepare_stream
+        File.open(destination_path, "w+")
+      end
+    end
+
+    def structure
+      @structure ||= begin
+        args = ["-e", "'DESCRIBE SCHEMA'"]
+        runner = Cassie::Support::CommandRunner.new("cqlsh", args)
+        runner.run
+
+        raise runner.failure_message unless runner.success?
+
+        runner.output
+      end
+    end
+
+    def versions
+      @versions ||= begin
+        versions_query.fetch
+      rescue Cassandra::Errors::InvalidError => e
+        log_versions_not_found(e)
+        []
+      end
+    end
+
+    def versions_insert_cql
+      inserts = versions.map do |v|
+        InsertVersionQuery.new(version: v).to_cql
+      end
+      inserts.join("\n")
+    end
+
+    def dump
+      stream << structure
+      stream << "\n\n"
+      stream << versions_insert_cql
+      stream << "\n"
+
+      close_stream
+    end
+
+    def versions_table_name
+      "cassie_schema.versions"
+    end
+
+    def destination_path
+      @destination_path || raise("Unconfigured schema structure path: `Cassie::Migration.paths[:schema_structure]` is empty")
+    end
+
+    protected
+
+    def versions_query
+      SelectVersionsQuery.new
+    end
+
+    def default_destination_path
+      Cassie::Migration.paths[:schema_structure]
+    end
+
+    def prepare_stream
+      dir = File.dirname(destination_path)
+      Dir.mkdir(dir) unless File.directory?(dir)
+    end
+
+    def close_stream
+      stream.close
+      @stream = nil
+    end
+
+    def log_versions_not_found(error)
+      msg = "WARNING: Cassie Schema Versions table not found at '#{versions_table_name}'. Create a migration, or initialize your schema for versioned migration support."
+      msg << "\n\t"
+      msg << error.message.split("\n").join("\n\t")
+      logger.warn(msg)
+    end
+
+    def logger
+      Cassie.logger
+    end
+  end
+end

data/lib/cassie/migration/structure_loader.rb

@@ -0,0 +1,24 @@
+module Cassie::Migration
+ class StructureLoader
+   attr_reader :source_path
+
+
+  def initialize(opts={})
+    @source_path = opts[:source_path] || default_source_path
+  end
+
+  def load
+    args = ["-f", source_path]
+    runner = Cassie::Support::CommandRunner.new("cqlsh", args)
+
+    runner.run
+    raise runner.failure_message unless runner.success?
+  end
+
+  protected
+
+  def default_source_path
+    Cassie.paths[:schema_structure]
+  end
+ end
+end

data/lib/cassie/migration/version.rb

@@ -0,0 +1,4 @@
+module Cassie::Migration
+  Version = Struct.new(:id, :version_number, :description, :migrator, :migrated_at) do
+  end
+end

data/lib/cassie/migration.rb

@@ -0,0 +1,30 @@
+module Cassie
+  require_relative 'migration/configuration'
+  require_relative 'migration/initialization'
+
+  module Migration
+    extend Configuration
+    include Initialization
+
+    require_relative 'migration/structure_dumper'
+    require_relative 'migration/structure_loader'
+    require_relative 'migration/version'
+
+    def self.version_number
+      return nil unless version
+      version.version_number
+    end
+
+    def self.version
+      SelectVersionsQuery.new.fetch_first
+    rescue Cassandra::Errors::InvalidError
+      raise uninitialized_error
+    end
+
+    def self.versions
+      SelectVersionsQuery.new.fetch
+    rescue Cassandra::Errors::InvalidError
+      raise uninitialized_error
+    end
+  end
+end

data/lib/cassie/statements/README.md

@@ -445,7 +445,15 @@ query.result.each
 #=> #<[#< Struct id=:123, username=:eprothro >]>
 ```
 
-The result also delegates to the `Cassandra::Result`.
+The result has a `first!` method that raises if no result is available
+```ruby
+query.execute
+#=> true
+query.result.first!
+Cassie::Statements::RecordNotFound: CQL row does not exist
+```
+
+The result delegates to the `Cassandra::Result`.
 ```ruby
 query.result.execution_info
 #=> #<Cassandra::Execution::Info:0x007fb404b51390 @payload=nil, @warnings=nil, @keyspace="cassie_test", @statement=#<Cassandra::Statements::Bound:0x3fda0258dee8 @cql="SELECT * FROM users_by_username LIMIT 500;" @params=[]>, @options=#<Cassandra::Execution::Options:0x007fb404b1b880 @consistency=:local_one, @page_size=10000, @trace=false, @timeout=12, @serial_consistency=nil, @arguments=[], @type_hints=[], @paging_state=nil, @idempotent=false, @payload=nil>, @hosts=[#<Cassandra::Host:0x3fda02541390 @ip=127.0.0.1>], @consistency=:local_one, @retries=0, @trace=nil>
@@ -734,6 +742,20 @@ end
 
 > Note: unbound queries can be vulnerable to injection attacks. Be careful.
 
+### Development and Debugging
+
+#### `to_cql`
+
+Cassie query objects have a `to_cql` method that handles positional argument interleaving and type conversion to provide CQL that is executable in `cqlsh`.
+
+Keep your queries as perpared/bound statements, but easily copy executable CQL elsewhere.
+
+```
+query = UpdateUserQuery.new(user: user)
+query.to_cql
+=> "UPDATE users_by_id SET phone = '+15555555555', email = 'eprothro@example.com', username = 'eprothro' WHERE id = d331f6b8-8b05-11e6-b61f-2774b0185e07;"
+```
+
 #### Logging
 
 Cassie Query objects use the Cassie logger unless overridden. This logs to STDOUT by default. Set any log stream you wish.

data/lib/cassie/statements/execution/partition_linking/policy_methods.rb

@@ -73,7 +73,7 @@ module Cassie::Statements::Execution::PartitionLinking
         previous_key(current_key)
       end
       if _partition < first_key || _partition > last_key
-        logger.warn("[WARN] linking to partition that is outside of ranges defined. #{_partition} outside of (#{first_key}..#{last_key}). This could result in unexpected records being returned.")
+        logger.warn("warning: linking to partition that is outside of ranges defined. #{_partition} outside of (#{first_key}..#{last_key}). This could result in unexpected records being returned.")
       end
 
       # define object singleton method to
@@ -116,10 +116,10 @@ module Cassie::Statements::Execution::PartitionLinking
       Cassie::Statements.logger
     end
 
-    def eval_opt(value, _source=source)
+    def eval_opt(value, src=source)
       case value
       when Symbol
-        _source.send(value)
+        src.send(value)
       else
         value
       end

data/lib/cassie/statements/execution/partition_linking.rb

@@ -16,7 +16,8 @@ module Cassie::Statements::Execution
       end
 
       def partition_linker
-        @partition_linker || SimplePolicy
+        return @partition_linker if defined?(@partition_linker)
+        SimplePolicy
       end
 
       def partition_linker_args=(val)

data/lib/cassie/statements/execution/results/querying.rb

@@ -38,6 +38,10 @@ module Cassie::Statements::Results
       end
     end
 
+    def first!
+      first || (raise Cassie::Statements::RecordNotFound, 'CQL row does not exist')
+    end
+
     def success?
       # an empty query is still successful
       return true if __getobj__.empty?

data/lib/cassie/statements/statement/assignment.rb

@@ -39,10 +39,10 @@ module Cassie::Statements::Statement
 
     private
 
-    def source_eval(value, _source=source)
+    def source_eval(value, src=source)
       case value
       when Symbol
-        _source.send(value)
+        src.send(value)
       else
         value
       end

data/lib/cassie/statements/statement/conditions.rb

@@ -6,6 +6,7 @@ module Cassie::Statements::Statement
       def if_not_exists(opts={})
         condition = "NOT EXISTS"
         opts.delete(:value)
+        opts[:if] = true unless opts.has_key?(:if)
 
         conditions[condition] = opts
       end
@@ -13,6 +14,7 @@ module Cassie::Statements::Statement
       def if_exists(opts={})
         condition = "EXISTS"
         opts.delete(:value)
+        opts[:if] = true unless opts.has_key?(:if)
 
         conditions[condition] = opts
       end
@@ -31,9 +33,9 @@ module Cassie::Statements::Statement
       bindings = []
 
       conditions.each do |condition, opts|
-        if eval_if_opt?(opts[:if])
+        if !!source_eval(opts[:if])
           condition_strings << condition.to_s
-          bindings << eval_value_opt(opts[:value]) if opts.has_key?(:value)
+          bindings << source_eval(opts[:value]) if opts.has_key?(:value)
         end
       end
 

data/lib/cassie/statements/statement/limiting.rb

@@ -62,12 +62,14 @@ module Cassie::Statements
 
     def initialize_copy(other)
       super
+      @jruby_issue_4228 = false
       remove_limit_singleton
     end
 
     def define_limit_singleton(temp_limit)
       assert_no_limit_singleton
       define_singleton_method(:limit) do
+        return super() if jruby_issue_4228?
         temp_limit
       end
     end
@@ -78,12 +80,18 @@ module Cassie::Statements
           remove_method :limit
         end
       end
+    rescue NameError
+      @jruby_issue_4228 = true
     end
 
     def assert_no_limit_singleton
       if singleton_methods.include?(:limit)
-        raise NameError.new("A singleton method has already been defined for `limit`. `with_limit` can't be implemented.", :limit)
+        raise NameError.new("A singleton method has already been defined for `limit`. `with_limit` can't be implemented.", :limit) unless jruby_issue_4228?
       end
     end
+
+    def jruby_issue_4228?
+      defined?(@jruby_issue_4228) && @jruby_issue_4228
+    end
   end
 end

data/lib/cassie/statements/statement/relation.rb

@@ -56,10 +56,10 @@ module Cassie::Statements::Statement
 
     private
 
-    def source_eval(value, _source=source)
+    def source_eval(value, src=source)
       case value
       when Symbol
-        _source.send(value)
+        src.send(value)
       else
         value
       end

data/lib/cassie/statements/statement.rb

@@ -35,6 +35,16 @@ module Cassie::Statements
       Cassandra::Statements::Simple.new(*build_cql_and_bindings)
     end
 
+    # returns a CQL string with inline parameters, that
+    # is representative of what would be executed in a CQL shell
+    def to_cql
+      if statement.respond_to?(:cql) && statement.respond_to?(:params)
+        Cassie::Support::StatementParser.new(statement).to_cql
+      else
+        statement.to_s
+      end
+    end
+
     protected
 
     def build_cql_and_bindings
@@ -47,25 +57,10 @@ module Cassie::Statements
 
     private
 
-    def eval_if_opt?(value)
-      case value
-      when nil
-        true # if is true by default
-      when Symbol
-        !!send(value)
-      when String
-        !!eval(value)
-      else
-        !!value
-      end
-    end
-
-    def eval_value_opt(value)
+    def source_eval(value, src=self)
       case value
       when Symbol
-        send(value)
-      when String
-        eval(value)
+        src.send(value)
       else
         value
       end

data/lib/cassie/support/command_runner.rb

@@ -1,6 +1,6 @@
 module Cassie::Support
   class CommandRunner
-    attr_reader :binary, :args, :command, :process, :duration, :output
+    attr_reader :binary, :args, :command, :status, :duration, :output
 
     # When a block is given, the command runs before yielding
     def initialize(binary, args=[])
@@ -21,55 +21,47 @@ module Cassie::Support
 
       IO.popen(command) do |io|
         @output=io.read
-        @process=Process.waitpid2(io.pid)[1]
+        @status=Process.waitpid2(io.pid)[1]
       end
 
       @duration=Time.now-t1
-      exitcode == 0
-    end
-
-    # Runs the command and raises if doesn't exit 0
-    def run!
-      fail unless exitcode == 0
-    end
-
-    def fail
-      Kernel.fail error_message
+      completed?
     end
 
     # Returns false if the command hasn't been executed yet
     def run?
-      !!process
+      !!@duration
     end
 
     # Returns the exit code for the command. Runs the command if it hasn't run yet.
     def exitcode
-      ensure_run
-      process.exitstatus
+      status.exitstatus
     end
 
-    # Returns true if the command completed execution.
-    # Will return false if the command hasn't been executed
-    def finished?
-      return false unless process
-      process.success?
+    # Returns true if exited 0
+    def success?
+      return false unless run?
+      exitcode == 0
     end
 
-    protected
-
-    def ensure_run
-      run unless process
+    # Returns true if the command completed execution and success bits were set.
+    # Will return false if the command hasn't been executed
+    def completed?
+      return false unless run?
+      status.exited? && @status.success?
     end
 
-    def error_message
-      msg = "\n"
+    def failure_message
+      msg = "---------------------\n"
       msg << red(output)
-      msg << "\n---------------------"
-      msg << "\n\nfailed to execute `#{command}`.\n"
-      msg << "Please check the output above for any errors and make sure that `#{binary}` is installed in your PATH with proper permissions.\n"
+      msg << "---------------------\n"
+      msg << "Failed to execute `#{command}`:\n"
+      msg << "\tPlease check the output above for any errors and make sure that `#{binary}` is installed in your PATH with proper permissions."
       msg
     end
 
+    protected
+
     def red(message)
       "\e[1m\e[31m#{message}\e[0m\e[22m"
     end

data/lib/cassie/support/statement_parser.rb

@@ -0,0 +1,41 @@
+module Cassie::Support
+  class StatementParser
+    attr_reader :statement
+
+    def initialize(statement)
+      @statement = statement
+    end
+
+    def bound_cql
+      statement.cql
+    end
+
+    def params
+      statement.params
+    end
+
+    def params_types
+      statement.params_types
+    end
+
+    def to_cql
+      cql = bound_cql.dup
+
+      params_types.map.with_index do |type, i|
+        cassandra_param = type.new(params[i])
+        quoted_val = if QUOTED_TYPES.include? type.kind
+          "'#{cassandra_param.to_s}'"
+        else
+          cassandra_param.to_s
+        end
+
+        cql.sub!("?", quoted_val)
+      end
+      cql
+    end
+
+    protected
+
+    QUOTED_TYPES = [:date, :time, :text, :timestamp, :inet, :ascii].freeze
+  end
+end

data/lib/cassie/support.rb

@@ -1,5 +1,6 @@
 module Cassie
   module Support
     require_relative 'support/command_runner'
+    require_relative 'support/statement_parser'
   end
 end

data/lib/cassie/testing/fake/prepared_statement.rb

@@ -1,13 +1,24 @@
 module Cassie::Testing::Fake
   class PreparedStatement
-    attr_reader :statement
+    attr_reader :original_statement
 
     def initialize(statement)
-      @statement = statement
+      @original_statement = statement
     end
 
-    def bind(params)
-      statement
+    # Creates a statement bound with specific arguments
+    #
+    # Cassandra does type checking against connection version
+    # which requires a connection.
+    #
+    # Note: this fake implementation returns a simple statement
+    # not a bound statement. Implementing the latter would require
+    # faking the metadata on the prepared statement object
+    # which I don't have reason to do yet
+    def bind(new_params)
+      fake_bound = original_statement.clone
+      fake_bound.instance_variable_set :@params, new_params
+      fake_bound
     end
   end
 end

data/lib/cassie/version.rb

@@ -1,3 +1,3 @@
 module Cassie
-  VERSION = "1.0.0.beta.22"
+  VERSION = "1.0.0.beta.24"
 end

data/lib/cassie.rb

@@ -20,6 +20,7 @@ module Cassie
   require_relative 'cassie/definition'
   require_relative 'cassie/query'
   require_relative 'cassie/modification'
+  require_relative 'cassie/migration'
 
   extend Configuration::Core
   extend ConnectionHandler

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassie
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.22
+  version: 1.0.0.beta.24
 platform: ruby
 authors:
 - Evan Prothro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
@@ -45,89 +45,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.3'
-- !ruby/object:Gem::Dependency
-  name: gem-release
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.4
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.4.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: benchmark-ips
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
 description: Cassie provides database configration, versioned migrations, efficient
   session management, and query classes. This allows applications to use the functionality
   provided by the official `cassandra-driver` through lightweight and easy to use
@@ -153,6 +103,18 @@ files:
 - lib/cassie/connection_handler/sessions.rb
 - lib/cassie/definition.rb
 - lib/cassie/logger.rb
+- lib/cassie/migration.rb
+- lib/cassie/migration/README.md
+- lib/cassie/migration/configuration.rb
+- lib/cassie/migration/initialization.rb
+- lib/cassie/migration/queries.rb
+- lib/cassie/migration/queries/create_schema_keyspace_query.rb
+- lib/cassie/migration/queries/create_versions_table_query.rb
+- lib/cassie/migration/queries/insert_version_query.rb
+- lib/cassie/migration/queries/select_versions_query.rb
+- lib/cassie/migration/structure_dumper.rb
+- lib/cassie/migration/structure_loader.rb
+- lib/cassie/migration/version.rb
 - lib/cassie/modification.rb
 - lib/cassie/query.rb
 - lib/cassie/statements.rb
@@ -208,6 +170,7 @@ files:
 - lib/cassie/statements/statement/updating.rb
 - lib/cassie/support.rb
 - lib/cassie/support/command_runner.rb
+- lib/cassie/support/statement_parser.rb
 - lib/cassie/testing.rb
 - lib/cassie/testing/README.md
 - lib/cassie/testing/fake/definition.rb