cassie 1.0.6.pre1 → 1.0.6.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a666b2c1cd7989d7ae10dc0ffd994f7cd942d54b
-  data.tar.gz: 94075bcf8311158255ccd5174d8b883a8004ccb1
+  metadata.gz: e87e9f31fbcda1c157ea0ab6ab1448979b4c4fdc
+  data.tar.gz: 8d502e415d094a962000ef91d2d1b01a7372e6cd
 SHA512:
-  metadata.gz: '011389da5a2e79dfd9fd909290e109667e933d75c9465fd5be878149e7f4a8e8a682544f6d38a00697ea21a58ee0b6fefd25dea9f86f576d3271afc84a3b1c29'
-  data.tar.gz: ca04b1f8ae1a515d51476cafb9e24e21c51300a052978818a3f18a9812dd61004bb8b5c3601559f90d31e12a8a377ac5f65ae111a5fa20e3ef30ab2f4cb7ae45
+  metadata.gz: b4f85555049d4ee14ca32bd328f58be26ae9a8e65a076087818076f17c78700db94f2a52570f96a8d07465dc57336945825958c40e030cd09e47440afe03370d
+  data.tar.gz: b9a2c4dd0851603c55f0e1aa7ebe083a13ab3d1d6f0f6b6172a92f3ac2fd4b68ad3ec3bd84f697327cc07bfdaae4058a377f30e8db7de88cdf8a954689c99240

data/lib/cassie/schema/README.md

@@ -36,7 +36,9 @@ cassie schema:init
 
 If an existing schema (e.g. keyspace, tables, types) is alredy defined, see below on how to import it.
 
-#### Coming from `cassandra_migrations`
+#### Importing an existing schema
+
+##### Coming from `cassandra_migrations`
 
 Import your existing `cassandra_migrations` migration files with a single task:
 
@@ -70,7 +72,7 @@ cassie migrations:import
 
 > The original `cassandra_migrations` migration files and schema in the physical layer are not changed. Remove the old files when comfortable.
 
-#### Coming from no explicit migration/versioning management
+##### Coming from no explicit migration/versioning management
 
 Import your existing schema held in Cassandra with a single task:
 

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

@@ -3,6 +3,7 @@ module Cassie::Schema
     # use fully-qualified tablename
     # for cql generation for standalone queries
     self.keyspace = nil
+    consistency :all
 
     insert_into "#{Cassie::Schema.schema_keyspace}.#{Cassie::Schema.versions_table}"
 

data/lib/cassie/tasks/io.rb

@@ -9,7 +9,7 @@ module Cassie::Tasks
 
       return unless exception.backtrace.try(:any?)
 
-      if argv.include?("--trace")
+      if Cassie::Tasks::IO.trace?
         puts "  #{exception.class}:"
         puts "    #{exception.backtrace.join("\n    ")}"
       else
@@ -24,5 +24,13 @@ module Cassie::Tasks
     def argv
       ARGV
     end
+
+    def self.trace?
+      !!@trace
+    end
+
+    def self.trace!
+      @trace = true
+    end
   end
 end

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

@@ -10,11 +10,11 @@ namespace :cassie do
         end
       end.parse!(argv)
 
-      not_found = Proc.new do
-        str   =  "Version #{version} was not found locally, can't fast-forward there."
-        str   += "  Did you mean one of these local versions?" if Cassie::Schema.local_versions
+      def raise_not_found(version)
+        str   =  "Version #{version} was not found locally, can't fast-forward there.\n"
+        str   += "  Did you mean one of these local versions?\n" if Cassie::Schema.local_versions
         Cassie::Schema.local_versions.reverse.each do |v|
-          str += "    - #{v.to_s.ljust(10)} # #{v.description}"
+          str += "    - #{v.to_s.ljust(10)} # #{v.description}\n"
         end
         raise str
       end
@@ -22,12 +22,17 @@ namespace :cassie do
       begin
         if opts[:version]
           version = Cassie::Schema::Version.new(opts[:version])
-          version = Cassie::Schema.local_versions.find(not_found){|v| version == v}
+          version = Cassie::Schema.local_versions.find{|v| version == v} || raise_not_found(version)
           versions = Cassie::Schema.local_versions.select{|v| v <= version}.sort
           puts "-- Fast-forwarding to version #{version}"
-            versions.each do |v|
+            t0 = Time.now
+            versions.each.with_index do |v, i|
+              # space IDs out by 10 seconds to ensure they get written in order
+              time = t0 - (versions.count - i * 10)
+              v.id = ::Cassandra::TimeUuid::Generator.new.at(time)
+              v.executor = "cassie"
               Cassie::Schema.record_version(v, false)
-              puts "   > Recorded version #{version}"
+              puts "   > Recorded version #{v}"
             end
           puts "-- done"
 

data/lib/cassie/tasks/task_runner.rb

@@ -6,9 +6,8 @@ module Cassie
       attr_reader :command
       attr_reader :options
 
-      def initialize(raw_args)
-        @raw_args = raw_args
-        @args = raw_args.dup
+      def initialize(args)
+        @args = args
         @command = nil
         @command = args.delete_at(0) if args.first =~ /\A[^-]/
         @options = {}
@@ -18,6 +17,7 @@ module Cassie
         build_options
         Cassie.logger.level = ::Logger::WARN unless options[:debug]
         Cassie.env = options[:environment] if options[:environment]
+        Cassie::Tasks::IO.trace! if options[:trace]
 
         run_command || display_info
       rescue OptionParser::InvalidOption => e

data/lib/cassie/version.rb

@@ -1,3 +1,3 @@
 module Cassie
-  VERSION = "1.0.6.pre1"
+  VERSION = "1.0.6.pre2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassie
 version: !ruby/object:Gem::Version
-  version: 1.0.6.pre1
+  version: 1.0.6.pre2
 platform: ruby
 authors:
 - Evan Prothro