cassandra_migrations 0.0.1.pre6 → 0.0.1.pre7

data/bin/prepare_for_cassandra

@@ -57,6 +57,6 @@ puts '  1. configure '.green + 'config/cassandra.yml'.red
 puts '  2. run '.green + 'rake cassandra:setup'.red + ' and try starting your application'.green
 puts '  3. create your first migration with '.green + 'rails g cassandra_migration'.red
 puts '  4. apply your migration with '.green + 'rake cassandra:migrate'.red
-puts '  5. run '.green + 'rake cassandra:test:prepare'.red + 'and start testing'.green
+puts '  5. run '.green + 'rake cassandra:test:prepare'.red + ' and start testing'.green
 puts '  6. have lots of fun!'.green.blink
 

data/lib/cassandra_migrations/cassandra/keyspace_operations.rb

@@ -24,7 +24,7 @@ module CassandraMigrations
         begin
           execute("DROP KEYSPACE #{Config.keyspace}")
         rescue Cql::QueryError
-          raise Errors::UnexistingKeyspaceError, keyspace
+          raise Errors::UnexistingKeyspaceError, Config.keyspace
         end
       end
     

data/lib/cassandra_migrations/cassandra/query_result.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+
+module CassandraMigrations
+  module Cassandra
+    class QueryResult
+      
+      def initialize(cql_query_result)
+        @cql_query_result = cql_query_result
+      end
+      
+      # We don't want to flood the console or the log with an inspection of
+      # a lot of loaded data
+      def inspect
+        "#<CassandraMigrations::Cassandra::QueryResult:#{object_id}>"
+      end
+
+      # Returns {'column_name' => :column_type} hash
+      def metadata
+        hash = {}
+        @cql_query_result.metadata.each do |column_metadata|
+          hash[column_metadata.column_name] = column_metadata.type   
+        end
+        hash
+      end
+
+      # Delegates all other method calls to the lower level query result (Cql::Client::QueryResult)
+      def method_missing(name, *args, &block)
+        @cql_query_result.send(name, *args, &block)
+      end
+
+    end
+  end
+end

data/lib/cassandra_migrations/cassandra.rb

@@ -3,6 +3,7 @@
 require 'yaml'
 require 'cql'
 require 'cassandra_migrations/cassandra/queries'
+require 'cassandra_migrations/cassandra/query_result'
 require 'cassandra_migrations/cassandra/keyspace_operations'
 
 module CassandraMigrations
@@ -13,8 +14,14 @@ module CassandraMigrations
     mattr_accessor :client
     
     def self.start!
-      # setup keyspace use
-      use(Config.keyspace)
+      begin
+        # setup keyspace use
+        use(Config.keyspace)
+      rescue Errors::MissingConfigurationError
+        # It's acceptable to not have a configuration file, that's why we rescue this exception.
+        # On the other hand, if the user try to execute a query this same exception won't be rescued
+        Rails.logger.try(:warn, "There is no config/cassandra.yml. Skipping connection to Cassandra...") 
+      end
     end
     
     def self.restart!
@@ -44,7 +51,8 @@ module CassandraMigrations
 
     def self.execute(cql)
       connect_to_server unless client
-      client.execute(cql)
+      result = client.execute(cql)
+      QueryResult.new(result) if result
     end  
     
   private

data/lib/cassandra_migrations/errors.rb

@@ -8,21 +8,13 @@ module CassandraMigrations
     
     class ClientNotStartedError < CassandraError
       def initialize
-        super("Cassandra.start has not been called yet! Can't execute queries before connecting to server...")
+        super("Cassandra.start! has not been called yet! Can't execute queries before connecting to server...")
       end
     end
     
     class MissingConfigurationError < CassandraError
       def initialize
-        super("config/cassandra.yml is missing use this as example: \n\
-               development: \n\
-                 host: '127.0.0.1' \n\
-                 port: 9042 \n\
-                 keyspace: 'lme_smart_grid_server_development' \n\
-                 replication: \n\
-                   class: 'SimpleStrategy' \n\
-                   replication_factor: 1
-              ")
+        super("config/cassandra.yml is missing! Run 'prepare_for_cassandra .' in the rails root directory.")
       end
     end
     

data/template/cassandra.yml

@@ -0,0 +1,23 @@
+development:
+  host: '127.0.0.1'
+  port: 9042
+  keyspace: 'my_keyspace_name'
+  replication:
+    class: 'SimpleStrategy'
+    replication_factor: 1
+
+test:
+  host: '127.0.0.1'
+  port: 9042
+  keyspace: 'my_keyspace_name_test'
+  replication:
+    class: 'SimpleStrategy'
+    replication_factor: 1
+    
+production:
+  host: '127.0.0.1'
+  port: 9042
+  keyspace: 'my_keyspace_name_production'
+  replication:
+    class: 'SimpleStrategy'
+    replication_factor: 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra_migrations
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre6
+  version: 0.0.1.pre7
   prerelease: 6
 platform: ruby
 authors:
@@ -116,25 +116,27 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/cassandra_migrations.rb
+- lib/cassandra_migrations/config.rb
 - lib/cassandra_migrations/capistrano.rb
-- lib/cassandra_migrations/migration.rb
-- lib/cassandra_migrations/migrator.rb
-- lib/cassandra_migrations/cassandra.rb
-- lib/cassandra_migrations/railtie.rb
-- lib/cassandra_migrations/cassandra/keyspace_operations.rb
 - lib/cassandra_migrations/cassandra/queries.rb
-- lib/cassandra_migrations/config.rb
-- lib/cassandra_migrations/migration/table_operations.rb
-- lib/cassandra_migrations/migration/column_operations.rb
-- lib/cassandra_migrations/migration/table_definition.rb
-- lib/cassandra_migrations/railtie/initializer.rb
+- lib/cassandra_migrations/cassandra/query_result.rb
+- lib/cassandra_migrations/cassandra/keyspace_operations.rb
+- lib/cassandra_migrations/railtie/tasks.rake
+- lib/cassandra_migrations/railtie/generators/cassandra_migration/USAGE
 - lib/cassandra_migrations/railtie/generators/cassandra_migration/cassandra_migration_generator.rb
 - lib/cassandra_migrations/railtie/generators/cassandra_migration/templates/empty_migration.rb.erb
-- lib/cassandra_migrations/railtie/generators/cassandra_migration/USAGE
-- lib/cassandra_migrations/railtie/tasks.rake
+- lib/cassandra_migrations/railtie/initializer.rb
+- lib/cassandra_migrations/migration.rb
+- lib/cassandra_migrations/migrator.rb
 - lib/cassandra_migrations/errors.rb
-- spec/cassandra_migrations_spec.rb
+- lib/cassandra_migrations/migration/column_operations.rb
+- lib/cassandra_migrations/migration/table_definition.rb
+- lib/cassandra_migrations/migration/table_operations.rb
+- lib/cassandra_migrations/cassandra.rb
+- lib/cassandra_migrations/railtie.rb
+- template/cassandra.yml
 - spec/cassandra_migrations/cassandra_spec.rb
+- spec/cassandra_migrations_spec.rb
 - bin/prepare_for_cassandra
 homepage: https://github.com/hsgubert/cassandra_migrations
 licenses:
@@ -162,5 +164,5 @@ signing_key:
 specification_version: 3
 summary: Cassandra schema management for a multi-environment developer.
 test_files:
-- spec/cassandra_migrations_spec.rb
 - spec/cassandra_migrations/cassandra_spec.rb
+- spec/cassandra_migrations_spec.rb