active_column 0.1.1 → 0.2

data/spec/spec_helper.rb

@@ -4,30 +4,31 @@ require 'rspec-rails'
 require 'rspec/rails/adapters'
 require 'wrong/adapters/rspec'
 
+ENV['RACK_ENV'] = ENV['RAILS_ENV'] = 'test'
 Wrong.config.alias_assert :expect
+ActiveColumn::Migration.verbose = false
 
 Dir[ File.expand_path("../support/**/*.rb", __FILE__) ].each {|f| require f}
 
-$cassandra = ActiveColumn.connection = Cassandra.new('active_column', '127.0.0.1:9160')
+thrift = { :retries => 3, :timeout => 2, :server_retry_period => nil }
+$cassandra = ActiveColumn.connection = Cassandra.new('active_column', '127.0.0.1:9160', thrift)
 
-ks_tasks = ActiveColumn::Tasks::Keyspace.new
-unless ks_tasks.exists?('active_column')
-  ks_tasks.create('active_column')
+keyspace = 'active_column'
+ks_tasks = ActiveColumn.keyspace_tasks
+unless ks_tasks.exists?(keyspace)
+  ks_tasks.create keyspace
 
-  cf_tasks = ActiveColumn::Tasks::ColumnFamily.new
+  cf_tasks = ActiveColumn.column_family_tasks
   [:tweets, :tweet_dms].each do |cf|
-    cf_tasks.create(cf, :keyspace => 'active_column')
+    cf_tasks.create cf
   end
 end
 
-ks_tasks.set 'active_column'
+ks_tasks.set keyspace
 ks_tasks.clear
 
 RSpec.configure do |config|
-
-  config.before do
-  end
-  
+  config.mock_with :mocha
 end
 
 class Counter
@@ -52,3 +53,27 @@ class Counter
     end
   end
 end
+
+require 'rspec/core/formatters/base_formatter'
+module RSpec
+  module Core
+    module Formatters
+      class BaseTextFormatter < BaseFormatter
+        def dump_failure(example, index)
+          exception = example.execution_result[:exception]
+          output.puts "#{short_padding}#{index.next}) #{example.full_description}"
+          output.puts "#{long_padding}#{red("Failure/Error:")} #{red(read_failed_line(exception, example).strip)}"
+          exception.message.split("\n").each { |line| output.puts "#{long_padding}#{red(line)}" } if exception.message
+
+          example.example_group.ancestors.push(example.example_group).each do |group|
+            if group.metadata[:shared_group_name]
+              output.puts "#{long_padding}Shared Example Group: \"#{group.metadata[:shared_group_name]}\" called from " +
+                                  "#{backtrace_line(group.metadata[:example_group][:location])}"
+              break
+            end
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: active_column
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  prerelease: 
+  version: "0.2"
 platform: ruby
 authors: 
 - Michael Wynholds
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 -08:00
-default_executable: 
+date: 2011-06-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cassandra
@@ -25,101 +20,83 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
         version: "0.9"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rails
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
+        version: "3.0"
+  type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: rspec-rails
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+        version: 2.5.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: wrong
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: wrong
+  name: yard
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: bluecloth
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: bluecloth
+  name: mocha
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id008
@@ -144,20 +121,26 @@ files:
 - docs/Create.md
 - docs/Migrate.md
 - docs/Query.md
+- generators/ks_migration/USAGE
+- generators/ks_migration/ks_migration_generator.rb
+- generators/ks_migration/templates/migration.rb.erb
 - lib/active_column.rb
 - lib/active_column/base.rb
-- lib/active_column/connection.rb
+- lib/active_column/configuration.rb
 - lib/active_column/errors.rb
 - lib/active_column/generators/migration_generator.rb
 - lib/active_column/generators/templates/migration.rb.erb
+- lib/active_column/helpers.rb
 - lib/active_column/key_config.rb
 - lib/active_column/migration.rb
+- lib/active_column/migrator.rb
 - lib/active_column/tasks/column_family.rb
 - lib/active_column/tasks/keyspace.rb
-- lib/active_column/tasks/ks.rb
+- lib/active_column/tasks/ks.rake
 - lib/active_column/version.rb
 - spec/active_column/base_crud_spec.rb
 - spec/active_column/base_finders_spec.rb
+- spec/active_column/migration_spec.rb
 - spec/active_column/migrator_spec.rb
 - spec/active_column/tasks/column_family_spec.rb
 - spec/active_column/tasks/keyspace_spec.rb
@@ -172,7 +155,6 @@ files:
 - spec/support/simple_key.rb
 - spec/support/tweet.rb
 - spec/support/tweet_dm.rb
-has_rdoc: true
 homepage: https://github.com/carbonfive/active_column
 licenses: []
 
@@ -186,27 +168,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: active_column
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Provides time line support and database migrations for Cassandra
 test_files: 
 - spec/active_column/base_crud_spec.rb
 - spec/active_column/base_finders_spec.rb
+- spec/active_column/migration_spec.rb
 - spec/active_column/migrator_spec.rb
 - spec/active_column/tasks/column_family_spec.rb
 - spec/active_column/tasks/keyspace_spec.rb
@@ -221,3 +200,4 @@ test_files:
 - spec/support/simple_key.rb
 - spec/support/tweet.rb
 - spec/support/tweet_dm.rb
+has_rdoc: 

data/lib/active_column/connection.rb

@@ -1,15 +0,0 @@
-module ActiveColumn
-
-  module Connection
-
-    def connection
-      @@connection
-    end
-
-    def connection=(connection)
-      @@connection = connection
-    end
-
-  end
-
-end

data/lib/active_column/tasks/ks.rb

@@ -1,76 +0,0 @@
-require 'rake'
-
-namespace :ks do
-
-  desc 'Create the keyspace in config/cassandra.yml for the current environment'
-  task :create => :environment do
-    config = load_config[Rails.env || 'development']
-    ks = config['keyspace']
-    ActiveColumn::Tasks::Keyspace.new.create ks, config
-    puts "Created keyspace: #{ks}"
-  end
-
-  desc 'Create keyspaces in config/cassandra.yml for all environments'
-  task 'create:all' => :environment do
-    config = load_config
-    kss = []
-    config.keys.each do |env|
-      kss << config[env]['keyspace']
-      ActiveColumn::Tasks::Keyspace.new.create kss.last, config
-    end
-    puts "Created keyspaces: #{kss.join(', ')}"
-  end
-
-  desc 'Drop keyspace in config/cassandra.yml for the current environment'
-  task :drop => :environment do
-    config = load_config[Rails.env || 'development']
-    ks = config['keyspace']
-    ActiveColumn::Tasks::Keyspace.new.drop ks
-    puts "Dropped keyspace: #{ks}"
-  end
-
-  desc 'Drop keyspaces in config/cassandra.yml for all environments'
-  task 'drop:all' => :environment do
-    config = load_config
-    kss = []
-    config.keys.each do |env|
-      kss << config[env]['keyspace']
-      ActiveColumn::Tasks::Keyspace.new.drop kss.last
-    end
-    puts "Dropped keyspaces: #{kss.join(', ')}"
-  end
-
-  desc 'Migrate the keyspace (options: VERSION=x)'
-  task :migrate => :environment do
-    set_keyspace
-    version = ( ENV['VERSION'] ? ENV['VERSION'].to_i : nil )
-    ActiveColumn::Migrator.migrate ActiveColumn::Migrator.migrations_path, version
-  end
-
-  desc 'Rolls the schema back to the previous version (specify steps w/ STEP=n)'
-  task :rollback => :environment do
-    set_keyspace
-    step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-    ActiveColumn::Migrator.rollback ActiveColumn::Migrator.migrations_path, step
-  end
-
-  desc 'Pushes the schema to the next version (specify steps w/ STEP=n)'
-  task :forward => :environment do
-    set_keyspace
-    step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-    ActiveColumn::Migrator.forward ActiveColumn::Migrator.migrations_path, step
-  end
-
-  private
-
-  def load_config
-    YAML.load_file(Rails.root.join("config", "cassandra.yml"))
-  end
-
-  def set_keyspace
-    config = load_config[Rails.env || 'development']
-    ActiveColumn::Tasks::Keyspace.new.set config['keyspace']
-  end
-
-end
-