cassie 1.0.5 → 1.0.6.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc013f89eb9dd8179dd4d301047728a98324d7cc
-  data.tar.gz: 4c63fcea715da5f1638dfde6136f8b9dce3aea17
+  metadata.gz: a666b2c1cd7989d7ae10dc0ffd994f7cd942d54b
+  data.tar.gz: 94075bcf8311158255ccd5174d8b883a8004ccb1
 SHA512:
-  metadata.gz: 9e1ea84d903b80375ba5ee5e863481d8b594f6ebb2bfb75baca920ee13fe2a0a5528144717131f9e3845bc0db281571ab305e48d7e5eb506f2a60083d2b4fc02
-  data.tar.gz: 8001a250cf5aa92d8a8fcfd77b65a0e712a8b4897312b328776db56e87a6401f7cbfe446de75cb068a2d051035832d3864c4559960bbdddd8b48cc0d9a2ad036
+  metadata.gz: '011389da5a2e79dfd9fd909290e109667e933d75c9465fd5be878149e7f4a8e8a682544f6d38a00697ea21a58ee0b6fefd25dea9f86f576d3271afc84a3b1c29'
+  data.tar.gz: ca04b1f8ae1a515d51476cafb9e24e21c51300a052978818a3f18a9812dd61004bb8b5c3601559f90d31e12a8a377ac5f65ae111a5fa20e3ef30ab2f4cb7ae45

data/bin/cassie

@@ -3,10 +3,6 @@
 require_relative '../lib/cassie'
 require_relative "../lib/cassie/tasks"
 
-runner = Cassie::Tasks::TaskRunner.new
-if ARGV.length > 0
-  runner.run_command(ARGV)
-else
-  runner.print_documentation
-end
+runner = Cassie::Tasks::TaskRunner.new(ARGV).run
+
 

data/lib/cassie/support/server_process.rb

@@ -3,6 +3,8 @@ module Cassie
     class ServerProcess
 
       attr_reader :pid
+      # @return [Array<String>] The Cassandra output lines tagged with ERROR
+      attr_reader :errors
 
       # Scan the system for cassandra processes running
       # @return [Array<ServerProcess>] Running cassandra processes
@@ -26,6 +28,7 @@ module Cassie
       # Starts a cassandra server process. {#running?} will be true if it started correctly.
       def initialize(pid=nil)
         @pid = pid
+        @errors = []
 
         if pid
           @running = true
@@ -59,13 +62,6 @@ module Cassie
         details[:command]
       end
 
-      # @return [Array<String>] The Cassandra output lines tagged with ERROR
-      # @!parse attr_reader :errors
-      def errors
-        return [] unless command && command.output
-        command.output.split("\n").grep(/ERROR/)
-      end
-
       protected
 
       def self.pids
@@ -83,6 +79,7 @@ module Cassie
         Cassie.logger.warn "[WARN] - Multiple cassandra processes started, using first one." if new_pids.length > 1
 
         @running = !!(cassandra.output =~ /state jump to NORMAL/)
+        @errors = cassandra.output.split("\n").grep(/ERROR/)
         @pid = new_pids.first
       end
 

data/lib/cassie/tasks/configuration/generate.rake

@@ -27,7 +27,7 @@ namespace :cassie do
         puts "   > #{green("created")} #{generator.destination_path}"
         puts "-- done"
       rescue => e
-        puts red("Error:\n  #{e.message}")
+        output_error(e)
         abort
       end
     end

data/lib/cassie/tasks/io.rb

@@ -4,6 +4,19 @@ module Cassie::Tasks
       io.puts(*args)
     end
 
+    def output_error(exception)
+      puts red("Error:  #{exception.message}")
+
+      return unless exception.backtrace.try(:any?)
+
+      if argv.include?("--trace")
+        puts "  #{exception.class}:"
+        puts "    #{exception.backtrace.join("\n    ")}"
+      else
+        puts "  (use --trace for exception info)"
+      end
+    end
+
     def io
       $stdout
     end

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

@@ -40,7 +40,7 @@ namespace :cassie do
         puts "   > #{green('created')} #{rel_path}"
         puts "-- done"
       rescue => e
-        puts red("Error:\n  #{e.message}")
+        output_error(e)
         abort
       end
     end

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

@@ -31,8 +31,8 @@ namespace :cassie do
         importer.import
         puts "-- done"
       rescue => e
-        importer.imported_paths.each {|f| File.delete(f) }
-        puts red("Error:\n  #{e.message}")
+        importer.imported_paths.each {|f| File.delete(f) } if importer
+        output_error(e)
         abort
       end
     end

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

@@ -20,7 +20,7 @@ namespace :cassie do
         end
         puts "-- done"
       rescue => e
-        puts red("Error:\n  #{e.message}")
+        output_error(e)
         abort
       end
     end

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

@@ -13,7 +13,7 @@ namespace :cassie do
         puts "-- done"
 
       rescue => e
-        puts red("Error:  \n#{e.message}")
+        output_error(e)
         abort
       end
     end

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

@@ -10,7 +10,7 @@ namespace :cassie do
       begin
         print_versions(Cassie::Schema.applied_versions)
       rescue Cassie::Schema::UninitializedError => e
-        puts red("Error:\n  #{e.message}")
+        output_error(e)
         abort
       end
     end

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

@@ -28,7 +28,7 @@ namespace :cassie do
         puts "   - done"
         puts "-- done"
       rescue => e
-        puts red("Error:\n  #{e.message}")
+        output_error(e)
         abort
       end
     end

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

@@ -2,52 +2,44 @@ namespace :cassie do
   namespace :schema do
 
     desc "Initialize versioning schema and the keyspace for this environment"
-    task :init => [:init_versioning, :init_keyspace]
-
-    desc "Initialize cassie schema versioning"
-    task :init_versioning do
-      include Cassie::Tasks::IO
+    task :init => :init_versioning do
+      opts = {}
+      OptionParser.new do |args|
+        args.on("-v", "--version VERSION", "Set an initial schema version representing the currenet version of the schema.") do |v|
+          opts[:version] = v
+        end
+      end.parse!(argv)
 
-      begin
-        puts "-- Initializing Cassie Versioning"
-        Cassie::Schema.initialize_versioning
-        puts "-- done"
-      rescue Cassie::Schema::AlreadyInitiailizedError
-        puts "   > Cassie Versioning already initialized "
-        puts "   > Schema is at version #{Cassie::Schema.version}"
-        puts "-- done"
-      rescue => e
-        puts red("Error:\n  #{e.message}")
-        abort
+      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
+        Cassie::Schema.local_versions.reverse.each do |v|
+          str += "    - #{v.to_s.ljust(10)} # #{v.description}"
+        end
+        raise str
       end
-    end
-
-    desc "Initialize the keyspace for the current environment"
-    task :init_keyspace do
-      include Cassie::Tasks::IO
 
       begin
-        name = Cassie.configuration[:keyspace]
-        puts "-- Initializing '#{name}' Keyspace"
-        query = Cassie::Schema::CreateKeyspaceQuery.new
-        query.name = name
-        if Cassie.configuration[:replication]
-          #@todo fill in
-        end
+        if opts[:version]
+          version = Cassie::Schema::Version.new(opts[:version])
+          version = Cassie::Schema.local_versions.find(not_found){|v| version == v}
+          versions = Cassie::Schema.local_versions.select{|v| v <= version}.sort
+          puts "-- Fast-forwarding to version #{version}"
+            versions.each do |v|
+              Cassie::Schema.record_version(v, false)
+              puts "   > Recorded version #{version}"
+            end
+          puts "-- done"
 
-        if Cassie.keyspace_exists?(query.name)
-          puts "   > '#{name}' already exists"
-        else
-          query.execute
         end
-        puts "-- done"
-
       rescue => e
-        puts red("Couldn't create keyspace, check #{Cassie.paths[:cluster_configurations]}:\n#{query.to_cql}")
-        puts "\t"
-        puts red("Error:\n  #{e.message}")
+        output_error(e)
         abort
       end
     end
+
+    Rake::Task["cassie:schema:init"].enhance do
+      Rake::Task["cassie:schema:init_keyspace"].invoke
+    end
   end
 end

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

@@ -0,0 +1,35 @@
+namespace :cassie do
+  namespace :schema do
+
+    desc "Initialize the keyspace for the current environment"
+    task :init_keyspace do
+      include Cassie::Tasks::IO
+
+      begin
+        name = Cassie.configuration[:keyspace]
+        puts "-- Initializing '#{name}' Keyspace"
+
+        query = Cassie::Schema::CreateKeyspaceQuery.new
+        query.name = name
+        if replicaiton = Cassie.configuration[:replication]
+          query.replication_class = replication[:class] if replication.has_key?(:class)
+          query.replication_factor = replication[:replication_factor] if replication.has_key?(:replication_factor)
+        end
+        query.durable_writes = Cassie.configuration[:durable_writes] if Cassie.configuration.has_key?(:durable_writes)
+
+        if Cassie.keyspace_exists?(query.name)
+          puts "   > '#{name}' already exists"
+        else
+          query.execute!
+        end
+        puts "-- done"
+
+      rescue => e
+        puts red("Couldn't create keyspace, check #{Cassie.paths[:cluster_configurations]}:\n#{query.to_cql}")
+        puts "\t"
+        output_error(e)
+        abort
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+namespace :cassie do
+  namespace :schema do
+
+    desc "Initialize cassie schema versioning"
+    task :init_versioning do
+      include Cassie::Tasks::IO
+
+      begin
+        puts "-- Initializing Cassie Versioning"
+        Cassie::Schema.initialize_versioning
+        puts "-- done"
+      rescue Cassie::Schema::AlreadyInitiailizedError
+        puts "   > Cassie Versioning already initialized "
+        puts "   > Schema is at version #{Cassie::Schema.version}"
+        puts "-- done"
+      rescue => e
+        output_error(e)
+        abort
+      end
+    end
+  end
+end

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

@@ -11,7 +11,7 @@ namespace :cassie do
         puts "   > Schema is now at version #{Cassie::Schema.version}"
         puts "-- done"
       rescue => e
-        puts red("Error:\n  #{e.message}")
+        output_error(e)
         abort
       end
     end

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

@@ -28,7 +28,7 @@ namespace :cassie do
           puts "-- done"
         end
       rescue => e
-        puts red("Error:\n  #{e.message}")
+        output_error(e)
         abort
       end
     end

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

@@ -11,7 +11,7 @@ namespace :cassie do
         all_versions = Cassie::Schema.applied_versions.to_a | Cassie::Schema.local_versions.to_a
         print_statuses(all_versions.sort.reverse)
       rescue Cassie::Schema::UninitializedError => e
-        puts red("Error:\n  #{e.message}")
+        output_error(e)
         abort
       end
     end

data/lib/cassie/tasks/task_runner.rb

@@ -1,28 +1,57 @@
 module Cassie
   module Tasks
     class TaskRunner
+      attr_reader :raw_args
+      attr_reader :args
+      attr_reader :command
+      attr_reader :options
 
-      def run_command(args)
-        cmd = args.delete_at(0) if args.first !~ /^-/
-        task = "cassie:#{cmd}"
+      def initialize(raw_args)
+        @raw_args = raw_args
+        @args = raw_args.dup
+        @command = nil
+        @command = args.delete_at(0) if args.first =~ /\A[^-]/
+        @options = {}
+      end
+
+      def run
+        build_options
+        Cassie.logger.level = ::Logger::WARN unless options[:debug]
+        Cassie.env = options[:environment] if options[:environment]
+
+        run_command || display_info
+      rescue OptionParser::InvalidOption => e
+        puts("#{e.message}\n\n")
+        display_info
+      end
 
-        Cassie.logger.level = ::Logger::WARN unless args.delete('--debug')
+      # @returns [Boolean] if task was invoked
+      def run_command
+        task && task.invoke
+      end
+
+      # @returns [Rake::Task, nil] nil if task is not defined, otherwise the task object itself
+      def task
+        task_name = "cassie:#{command}"
+        Rake::Task[task_name] if Rake::Task.task_defined?(task_name)
+      end
 
-        if Rake::Task.task_defined?(task)
-          Rake::Task[task].invoke
+      def display_info
+        case
+        when command && !task
+          puts "'#{command}' is not a supported command.\n\n"
+          print_documentation
+        when options[:show_help]
+          print_documentation
+        when options[:show_version]
+          puts Cassie::VERSION
         else
-          case args.delete_at(0)
-          when "--help"
-            print_documentation
-          when "-v"
-            puts Cassie::VERSION
-          else
-            puts "'#{cmd}' is not a supported command.\n\n"
-            print_documentation
-          end
+          print_documentation
         end
       end
 
+      protected
+
       def print_documentation
         docs = <<-EOS
 Usage:
@@ -38,12 +67,37 @@ EOS
 Options:
   -h, --help                # Print this documentation
   -v, --version             # List the library version
+  -d, --debug               # Show debug log lines
+  -e, --env                 # The Cassie.env to use
   <command> --help          # List options for a given command
+  <command> --trace         # Show exception backtrace
 
 EOS
 
         puts docs
       end
+
+      def build_options
+        @options.tap do |h|
+          # Options Parsers doesn't work well unles
+          # all options are passed up to a single parser.
+          # Since we don't want to shadow options and we
+          # do want sub-task --help to work
+          #
+          # As is, a sub task with dependencies
+          # may cause issues since the pre-task could
+          # have optiosn that cause a parsing error.
+          # Need to revisit and probably ditch rake tasks.
+          h[:trace] = args.delete("-t") || args.delete("--trace")
+          h[:debug] = args.delete("-d") || args.delete("--debug")
+          if env_index = (args.index("-e") || args.index("--env"))
+            h[:environment] = args.delete_at(env_index + 1)
+            args.delete_at(env_index)
+          end
+          h[:show_version] = args.include?("-v") || args.include?("--version")
+          h[:show_help] = args.include?("-h") || args.include?("--help")
+        end
+      end
     end
   end
 end

data/lib/cassie/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassie
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6.pre1
 platform: ruby
 authors:
 - Evan Prothro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
@@ -227,6 +227,8 @@ files:
 - lib/cassie/tasks/schema/history.rake
 - lib/cassie/tasks/schema/import.rake
 - lib/cassie/tasks/schema/init.rake
+- lib/cassie/tasks/schema/init_keyspace.rake
+- lib/cassie/tasks/schema/init_versioning.rake
 - lib/cassie/tasks/schema/load.rake
 - lib/cassie/tasks/schema/migrate.rake
 - lib/cassie/tasks/schema/reset.rake
@@ -263,12 +265,12 @@ 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.4.5.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Apache Cassandra application support