cassie 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57931ab0cf0675f1ee2165b8856356f273475769
-  data.tar.gz: faa9b5db7b96dc383d7042a979e5019967868f6d
+  metadata.gz: ae2e69dcfacf0f63a197eeb55e733d089fef8f7f
+  data.tar.gz: 5f7d24cd9dd32370c65f4a94a8d37aa4954782bf
 SHA512:
-  metadata.gz: 251c1ec5bfd7014dd95b3914968a1921aaafdb3cc8f2057b42e7deafebe686af55c664ef9719e51c4f166acbce27ac7a0e95cdaa829cca9f2d772d1ec547aea5
-  data.tar.gz: c8c92da0e5de488a37014eadd48920723e7d1a3e4c1138276620a81c4f90b974c996c5398d167a547d18ac2b3b337b9cf6043fbbdb6692c130d639f9a56aa7a7
+  metadata.gz: 7add13ef36796deebe1fbccf41a0540e8b7f961f344257bdb59b57b8698cd16a20b4485047ced5a7d0bbb86c3e4cf22f458ade9db86f2999e4ddc3b8cf12c3fb
+  data.tar.gz: 9ee9fc8144b862ab2edff0bc5adb547a15bdb2385c030f0b89d0a29d93b5b7bd15ba335fa8e4800323d815aa88c6eb5ae22af41af4cdc00ce50457fb0753b3e0

data/lib/cassie/schema/README.md

@@ -44,6 +44,10 @@ Import your existing `cassandra_migrations` migration files with a single task:
 cassie migrations:import
 ```
 ```bash
+-- Initializing Cassie Versioning
+-- done
+-- Initializing 'cassie_development' Keyspace
+-- done
 -- Importing `cassandra_migrations` migration files
    - Importing db/cassandra_migrate/20161206214301_initial_database.rb
      > created /db/cassandra/migrations/0000_0000_0000_0001_initial_database.rb
@@ -58,6 +62,10 @@ cassie migrations:import
      > recorded version 0.0.2.0
    - done
 -- done
+-- Dumping Cassandra schema (version 0.0.0.1)
+   - Writing to db/cassandra/schema.cql
+   - done
+-- done
 ```
 
 > The original `cassandra_migrations` migration files and schema in the physical layer are not changed. Remove the old files when comfortable.

data/lib/cassie/schema/cassandra_migrations/importer.rb

@@ -11,15 +11,18 @@ module Cassie::Schema
       attr_accessor :final_version
       # The migration files to be imported
       attr_accessor :migration_files
+      # The newly imported Cassie migration files
+      attr_accessor :imported_paths
       # A callback fired before importing each migration
       attr_accessor :before_each
       # A callback fired after importing each migration
       attr_accessor :after_each
 
       def initialize(source_path=nil)
-        @source = source_path || default_source_path
-        @final_version = Cassie::Schema::Version.new("0.0.1.0", "Remove cassandra_migrations schema")
-        @migration_files = find_migration_files
+        @source           = source_path || default_source_path
+        @final_version    = Cassie::Schema::Version.new("0.0.1.0", "Remove cassandra_migrations schema")
+        @migration_files  = find_migration_files
+        @imported_paths   = []
         @before_each      = Proc.new{}
         @after_each       = Proc.new{}
       end
@@ -27,7 +30,6 @@ module Cassie::Schema
       def import
         new_version = initial_version
         new_version.executor = "cassandra_migrations"
-        new_version.executed_at = Time.now
 
         migration_files.each do |old_migration_file|
           before_each.call(old_migration_file)
@@ -39,7 +41,7 @@ module Cassie::Schema
           # that is built from the old file
           writer.migration_contents = old_migration_file.build_migration_class(new_version)
 
-          writer.write
+          self.imported_paths << writer.write
 
           Cassie::Schema.record_version(new_version, false)
           after_each.call(new_version)

data/lib/cassie/schema/configuration.rb

@@ -12,7 +12,7 @@ module Cassie::Schema
     # @!visibility private
     def self.extended(extender)
       extender.paths["schema_file"] = "db/cassandra/schema.cql"
-      extender.paths["migrations_directory"] = "db/cassandra/migrations"
+      extender.paths[:migrations_directory] = "db/cassandra/migrations"
       extender.schema_keyspace = "cassie_schema"
       extender.versions_table = "versions"
     end

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

@@ -11,12 +11,16 @@ module Cassie::Schema
     set :number
     set :description
     set :executor
-    set :executed_at
+    set :executed_at, if: :executed_at?
 
     map_from :version
 
     def bucket
       0
     end
+
+    def executed_at?
+      !executed_at.nil?
+    end
   end
 end

data/lib/cassie/schema/version_writer.rb

@@ -17,6 +17,11 @@ module Cassie::Schema
       ensure_dir_exist
     end
 
+    # Writes the version's migration clas code to a new
+    # ruby migraton file in the
+    # +Cassie::Schema.paths[:migrations_directory]+
+    # @return [String] the filename of the path written
+    # @raise [IOError] if a file with a matching version already exists
     def write
       with_io do |io|
         io << migration_contents
@@ -33,6 +38,7 @@ module Cassie::Schema
         # for the methods will come from that file
         # instead of (eval)
         load File.absolute_path(filename)
+        filename
       end
     end
 
@@ -50,7 +56,7 @@ module Cassie::Schema
     end
 
     def directory
-      Cassie::Schema.paths["migrations_directory"]
+      Cassie::Schema.paths[:migrations_directory]
     end
 
     def basename

data/lib/cassie/schema/versioning.rb

@@ -56,10 +56,11 @@ module Cassie::Schema
 
       InsertVersionQuery.new(version: version).execute!
       @applied_versions = nil
-    rescue StandardError
+    rescue StandardError => e
       version.id = nil
       version.executed_at = nil
       version.executor = nil
+      raise e
     end
 
     # Remove the version from the schema version store.
@@ -74,7 +75,7 @@ module Cassie::Schema
     # Absolute paths to the migration files in the migration directory
     # @return [Array<String>]
     def migration_files
-      Dir[root.join(paths["migrations_directory"], "[0-9]*_*.rb")]
+      Dir[root.join(paths[:migrations_directory], "[0-9]*_*.rb")]
     end
 
     # Versions for the {#migration_files}

data/lib/cassie/tasks/migration/import.rake

@@ -4,7 +4,7 @@ require 'cassie/schema/cassandra_migrations/importer'
 namespace :cassie do
   namespace :migrations do
     desc "Imports existing `cassandra_migrations` migration files and converts to semantic versioning"
-    task :import do
+    task :import => "cassie:schema:init" do
       include Cassie::Tasks::IO
 
       begin
@@ -31,9 +31,14 @@ namespace :cassie do
         importer.import
         puts "-- done"
       rescue => e
+        importer.imported_paths.each {|f| File.delete(f) }
         puts red("Error:\n  #{e.message}")
         abort
       end
     end
   end
+end
+
+Rake::Task["cassie:migrations:import"].enhance do
+  Rake::Task["cassie:schema:dump"].invoke
 end

data/lib/cassie/tasks/schema/history.rake

@@ -14,5 +14,8 @@ namespace :cassie do
         abort
       end
     end
+
+    desc "Print the history of applied schema migrations"
+    task :versions => :history
   end
 end

data/lib/cassie/tasks/schema/init.rake

@@ -25,7 +25,6 @@ namespace :cassie do
     desc "Initialize the keyspace for the current environment"
     task :init_keyspace do
       include Cassie::Tasks::IO
-      Cassie.keyspace = nil
 
       begin
         name = Cassie.configuration[:keyspace]

data/lib/cassie/tasks/schema/version_display.rb

@@ -14,8 +14,12 @@ module Cassie::Tasks
         current_version = Cassie::Schema.version
 
         versions.each.with_index do |v|
-          row = v.to_h.values_at(*members)
+          row = []
+          row[0] = v.number
           row[0] = "* #{row[0]}" if v == current_version
+          row[1] = v.description
+          row[2] = v.executor
+          row[3] ||= "Unknown"
           table.add_row(row)
         end
 
@@ -26,7 +30,6 @@ module Cassie::Tasks
       def print_statuses(versions)
         # Note: if we end up using this elsewhere, move to Version::VersionList
         # or something simliar, and have version collection methods return that
-        members = [:number, :description]
         titles  = ['Number', 'Description', 'Status', 'Migration File']
         table = Terminal::Table.new(headings:  titles)
         current_version = Cassie::Schema.version

data/lib/cassie/version.rb

@@ -1,3 +1,3 @@
 module Cassie
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassie
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Evan Prothro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
@@ -92,10 +92,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-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
-  interfaces.
+description: Application support for Apache Cassandra using the the official `cassandra-driver`.
+  Cassie provides cluster configration, versioned migrations, efficient session management,
+  and a class-based query DSL. Easy to use with lightweight, component-style interfaces.
 email: evan.prothro@gmail.com
 executables:
 - cassie
@@ -269,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Apache Cassandra application support