communard 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9d35465b96eb5d58be0796c018ee8621dc2d139
-  data.tar.gz: 262fddbd090945bd223795f180b3cde77cfb7f75
+  metadata.gz: 803308ca6f5424ff74123dcbb892f6ef6b76ecd0
+  data.tar.gz: 310a953d2846d2f7f0b7f0188ae69c84635260d9
 SHA512:
-  metadata.gz: b761f87f3f14335888116e531945b8b400a0f87d586c768058ce8778b3e6ec146b515e3f6688708ec31dce614fff11147d3adc0903f4f0e6022f08c5dcf9963c
-  data.tar.gz: 0007179282297452070dc6a6283290a7bb0bfa2a65d94a33705326e1f30990bc931520aa235a778323062383e97f1cdb7a3407e4109ce31877812b091c5304e7
+  metadata.gz: bcd25b010ae79cc52aa3c50cea57d74072d924f68b3d84873d7399396052305d67beacf728d920e788ea7c0ca11bcd870cb6d036b5994938dc28e3eaa85f0f3d
+  data.tar.gz: e5c9d2270735b60a121e5057215f7d359268472398e16f4101bd605c09bb509f64162d9f1cedfaba4fe216be5f9b6b37befe056383a9148925287b5e66ca7223

data/.rspec

@@ -0,0 +1,4 @@
+--color
+--format documentation
+--order random
+--require spec_helper

data/Rakefile

@@ -1,2 +1,13 @@
 require "bundler/gem_tasks"
 
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+  task :spec do
+    puts "RSpec not installed"
+    exit 1
+  end
+end
+
+task :default => :spec

data/communard.gemspec

@@ -22,4 +22,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "pg"
+  spec.add_development_dependency "mysql2"
+  spec.add_development_dependency "aruba"
 end

data/lib/communard/configuration.rb

@@ -1,6 +1,3 @@
-require "logger"
-require "pathname"
-
 module Communard
   class Configuration
 

data/lib/communard/context.rb

@@ -1,5 +1,3 @@
-require "sequel"
-
 module Communard
   class Context
 
@@ -32,7 +30,9 @@ module Communard
     end
 
     def create_database(env: environment)
-      run_without_database("CREATE DATABASE %{database_name}", env: env)
+      unless adapter(env: env) == "sqlite"
+        run_without_database("CREATE DATABASE %{database_name}", env: env)
+      end
     rescue Sequel::DatabaseError => error
       if /database (.*) already exists/ === error.message
         loggers.each { |logger| logger.info "Database #{$1} already exists, which is fine." }
@@ -43,7 +43,14 @@ module Communard
 
     def drop_database(env: environment)
       fail ArgumentError, "Don't drop the production database, you monkey!" if env.to_s == "production"
-      run_without_database("DROP DATABASE IF EXISTS %{database_name}", env: env)
+      if adapter(env: env) == "sqlite"
+        file = options(env: env).fetch("database")
+        if File.exist?(file)
+          File.rm(file)
+        end
+      else
+        run_without_database("DROP DATABASE IF EXISTS %{database_name}", env: env)
+      end
     end
 
     def migrate(target: nil, env: environment)
@@ -87,7 +94,7 @@ module Communard
 
     private
 
-    def maintenance(env: env)
+    def maintenance(env: environment)
       Maintenance.new(connection: connect(options(env: env)), root: root)
     end
 
@@ -103,5 +110,9 @@ module Communard
       configuration.loggers
     end
 
+    def adapter(env: environment)
+      options(env: env).fetch("adapter").to_s
+    end
+
   end
 end

data/lib/communard/version.rb

@@ -1,3 +1,3 @@
 module Communard
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/communard.rb

@@ -1,3 +1,7 @@
+require "sequel"
+require "logger"
+require "pathname"
+
 require "communard/version"
 require "communard/maintenance"
 require "communard/configuration"

data/spec/integration_spec.rb

@@ -0,0 +1,94 @@
+require "yaml"
+
+RSpec.describe "Integration", type: :aruba do
+
+  example "SQLite" do
+    run_tests(
+      "adapter"  => "sqlite",
+      "database" => "db/test.sqlite3",
+      "pool"     => 5,
+      "timeout"  => 5000,
+    )
+  end
+
+  example "PostgreSQL" do
+    run_tests(
+      "adapter"  => "postgres",
+      "database" => "communard_test",
+      "pool"     => 5,
+      "timeout"  => 5000,
+    )
+  end
+
+  example "MySQL" do
+    run_tests(
+      "adapter"  => "mysql2",
+      "database" => "communard_test",
+      "username" => "root",
+      "pool"     => 5,
+      "timeout"  => 5000,
+    )
+  end
+
+
+  def run_tests(database_config)
+
+    write_file "config/database.yml", { "development" => database_config }.to_yaml
+
+    write_file "Rakefile", <<-FILE.gsub(/^\s{6}/, "")
+      $LOAD_PATH.unshift(File.expand_path("../../../lib", __FILE__))
+      require "yaml"
+      require "communard/rake"
+      Communard::Rake.add_tasks
+    FILE
+
+    run_simple "bundle exec communard --generate-migration create_posts"
+
+    file = Dir[absolute_path("db/migrate/*_create_posts.rb")].first
+
+    expect(File.read(file)).to eq <<-FILE.gsub(/^\s{6}/, "").chomp
+      Sequel.migration do
+        change do
+        end
+      end
+    FILE
+
+    write_file file, <<-FILE.gsub(/^\s{6}/, "")
+      Sequel.migration do
+        change do
+          create_table :posts do
+            primary_key :id
+            String :name
+          end
+        end
+      end
+    FILE
+
+    run_simple "rake db:drop"
+
+    run_simple "rake db:create"
+
+    run_simple "rake db:migrate"
+
+    write_file "app.rb", <<-FILE.gsub(/^\s{6}/, "")
+      $LOAD_PATH.unshift(File.expand_path("../../../lib", __FILE__))
+      require "yaml"
+      require "communard"
+
+      db = Communard.connect
+      posts = db[:posts]
+
+      4.times do
+        posts.insert(name: "hello world")
+      end
+
+      puts "Post count: '\#{posts.count}'"
+    FILE
+
+    run_simple "ruby app.rb"
+
+    assert_partial_output("Post count: '4'", all_stdout)
+  end
+
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,22 @@
+require 'aruba/api'
+require 'aruba/reporting'
+
+RSpec.configure do |config|
+  config.disable_monkey_patching!
+  config.include Aruba::Api, type: :aruba
+
+  config.before :each do
+    next unless self.class.include?(Aruba::Api)
+    restore_env
+    clean_current_dir
+
+    if ENV["DEBUG"] == "true"
+      @announce_stdout = true
+      @announce_stderr = true
+      @announce_cmd = true
+      @announce_dir = true
+      @announce_env = true
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: communard
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - iain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2015-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -52,6 +52,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Adds some conventions from ActiveRecord to Sequel.
 email:
 - iain@iain.nl
@@ -61,6 +131,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -73,6 +144,8 @@ files:
 - lib/communard/maintenance.rb
 - lib/communard/rake.rb
 - lib/communard/version.rb
+- spec/integration_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/yourkarma/communard
 licenses:
 - MIT
@@ -93,9 +166,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Adds some conventions from ActiveRecord to Sequel.
-test_files: []
-has_rdoc: 
+test_files:
+- spec/integration_spec.rb
+- spec/spec_helper.rb