slodd 0.1.1 → 0.1.2

data/.rubocop.yml

@@ -0,0 +1,6 @@
+StringLiterals:
+  EnforcedStyle: "double_quotes"
+Documentation:
+  Enabled: false
+Eval:
+  Enabled: false

data/README.md

@@ -9,16 +9,20 @@ Examples:
 
 ###Loading schema from github:
 
-slodd -g errm/awesome_rails_app -t my-secret-oauth-token -d "awesome_app awesome_test"
+`slodd -g errm/awesome_rails_app -t my-secret-oauth-token -d "awesome_app awesome_test"`
 
 or from a specific branch:
 
-slodd -g errm/awesome_rails_app -t my-secret-oauth-token -r my-brillant-branch -d "awesome_app awesome_test"
+`slodd -g errm/awesome_rails_app -t my-secret-oauth-token -r my-brillant-branch -d "awesome_app awesome_test"`
 
 ###Loading schema from a file (defaults to db/schema.rb):
 
-slodd -d awesome_test
+`slodd -d awesome_test`
 
 or
 
-slodd -f db/second_database.schema.rb -d awesome_test
+`slodd -f db/second_database.schema.rb -d awesome_test`
+
+###Downloading a schema (or any text file) from github
+
+`gurl -g errm/awesome_rails_app -t my-secret-oauth-token -r my-fancy-branch`

data/Rakefile

@@ -1,5 +1,8 @@
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
+Rubocop::RakeTask.new(:rubocop)
 RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
+
+task :default => [:spec, :rubocop]

data/bin/gurl

@@ -1,22 +1,23 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 
-require 'slodd'
-require 'optparse'
+require "slodd"
+require "optparse"
 
 OptionParser.new do |opt|
-  opt.on('-g', '--github USER/REPO', "github repo") do |g|
+  opt.on("-g", "--github USER/REPO", "github repo") do |g|
     Slodd::Config.github = g
   end
 
-  opt.on('-t', '--token TOKEN', "github token") do |t|
+  opt.on("-t", "--token TOKEN", "github token") do |t|
     Slodd::Config.token = t
   end
 
-  opt.on('-r', '--ref REF', "github ref") do |r|
+  opt.on("-r", "--ref REF", "github ref") do |r|
     Slodd::Config.ref = g
   end
 
-  opt.on( '-f', '--file-schema-path PATH', 'Path to schema.rb') do |f|
+  opt.on("-f", "--file-schema-path PATH", "Path to schema.rb") do |f|
     Slodd::Config.path = f
   end
 end.parse!

data/bin/slodd

@@ -1,42 +1,43 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 
-require 'slodd'
-require 'optparse'
+require "slodd"
+require "optparse"
 
 OptionParser.new do |opt|
-  opt.on('-d', '--database DATABASES', "Database names") do |d|
+  opt.on("-d", "--database DATABASES", "Database names") do |d|
     Slodd::Config.databases = d
   end
 
-  opt.on('-s', '--schema URI', "URI for schema.rb") do |s|
+  opt.on("-s", "--schema URI", "URI for schema.rb") do |s|
     Slodd::Config.url = s
   end
 
-  opt.on('-g', '--github USER/REPO', "github repo") do |g|
+  opt.on("-g", "--github USER/REPO", "github repo") do |g|
     Slodd::Config.github = g
   end
 
-  opt.on('-t', '--token TOKEN', "github token") do |t|
+  opt.on("-t", "--token TOKEN", "github token") do |t|
     Slodd::Config.token = t
   end
 
-  opt.on('-r', '--ref REF', "github ref") do |r|
+  opt.on("-r", "--ref REF", "github ref") do |r|
     Slodd::Config.ref = g
   end
 
-  opt.on( '-f', '--file-schema-path PATH', 'Path to schema.rb') do |f|
+  opt.on("-f", "--file-schema-path PATH", "Path to schema.rb") do |f|
     Slodd::Config.path = f
   end
 
-  opt.on('-u', '--username USERNAME', "MySQL Username") do |u|
+  opt.on("-u", "--username USERNAME", "MySQL Username") do |u|
     Slodd::Config.username = u
   end
 
-  opt.on('-p', '--password PASSWORD', "MySQL Password") do |p|
+  opt.on("-p", "--password PASSWORD", "MySQL Password") do |p|
     Slodd::Config.password = p
   end
 
-  opt.on('-h', '--host HOST', "MySQL Hostname") do |h|
+  opt.on("-h", "--host HOST", "MySQL Hostname") do |h|
     Slodd::Config.host = h
   end
 end.parse!

data/lib/slodd/config.rb

@@ -1,21 +1,23 @@
+# encoding: utf-8
 require "active_support/core_ext"
 
 module Slodd
   module Config
-    mattr_accessor :path, :github, :username, :password, :host, :url, :token, :ref
+    mattr_accessor :path, :github, :username, :password,
+                   :host, :url, :token, :ref
     mattr_writer :databases
 
     def self.defaults
       self.path = "db/schema.rb"
       self.username = "root"
       self.host = "localhost"
+      self.databases = nil
     end
 
     defaults
 
     def self.databases
-      return @@databases.split if defined?(@@databases)
-      []
+      @@databases ? @@databases.split : []
     end
 
     def self.database_settings
@@ -47,25 +49,14 @@ module Slodd
     end
 
     def self.attributes
-       {
-          owner: owner,
-          repo: repo,
-          token: token,
-          path: path,
-          ref: ref,
-          url: url,
-        }.delete_if { |k, v| v.nil? }
-    end
-
-    def self.reset
-      defaults
-      self.github = nil
-      self.password = nil
-      self.url = nil
-      self.token = nil
-      self.databases = nil
-      self.ref = nil
-      instance_eval { remove_class_variable "@@databases" } if defined?(@@databases)
+      {
+        owner: owner,
+        repo: repo,
+        token: token,
+        path: path,
+        ref: ref,
+        url: url,
+      }.delete_if { |_, v| v.nil? }
     end
   end
 end

data/lib/slodd/github.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "open-uri"
 
 module Slodd

data/lib/slodd/http.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "open-uri"
 
 module Slodd

data/lib/slodd/local.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Slodd
   class Local
     attr_accessor :path

data/lib/slodd/runner.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "active_record"
 require "mysql2"
 
@@ -19,22 +20,32 @@ module Slodd
     end
 
     private
+
     def create_database(database)
-      options = {charset: 'utf8', collation: 'utf8_unicode_ci'}
+      puts "create_database(#{database})"
 
       begin
         ActiveRecord::Base.establish_connection database_settings
         ActiveRecord::Base.connection.drop_database database
         ActiveRecord::Base.connection.create_database database, options
-        ActiveRecord::Base.establish_connection database_settings.merge(database: database)
+        ActiveRecord::Base.establish_connection database_settings(database)
       rescue Mysql2::Error => sqlerr
-        $stderr.puts sqlerr.error
-        $stderr.puts "Couldn't create database: #{database} settings: #{database_settings.inspect}, charset: utf8, collation: utf8_unicode_ci"
+        error_message(sqlerr, database)
       end
     end
 
-    def database_settings
-      Config.database_settings
+    def database_settings(database = nil)
+      Config.database_settings.merge(database: database)
+    end
+
+    def options
+      { charset: "utf8", collation: "utf8_unicode_ci" }
+    end
+
+    def error_message(sqlerr, database)
+      $stderr.puts sqlerr.error
+      settings = database_settings(database).merge(options).inspect
+      $stderr.puts "Couldn't create database with settings: #{settings}"
     end
 
     attr_accessor :schema

data/lib/slodd/version.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Slodd
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/slodd.rb

@@ -1,10 +1,11 @@
+# encoding: utf-8
 require "slodd/version"
 
-require 'slodd/github'
-require 'slodd/local'
-require 'slodd/http'
-require 'slodd/config'
-require 'slodd/runner'
+require "slodd/github"
+require "slodd/local"
+require "slodd/http"
+require "slodd/config"
+require "slodd/runner"
 
 module Slodd
 end

data/slodd.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["ed.robinson@reevoo.com"]
   gem.description   = %q{Schema Loading On Dependent Databases}
   gem.summary       = %q{Schema Loading On Dependent Databases}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/errm/slodd"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -20,4 +20,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency('mysql2')
   gem.add_development_dependency('rspec')
   gem.add_development_dependency('rake')
+  gem.add_development_dependency('simplecov')
+  gem.add_development_dependency('rubocop')
 end

data/spec/lib/config_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "spec_helper"
 
 describe Slodd::Config do

data/spec/lib/gitub_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "spec_helper"
 
 describe Slodd::Github do
@@ -19,12 +20,14 @@ describe Slodd::Github do
     )
   end
 
+  let(:expected_url) do
+    "https://api.github.com/repos/#{owner}/#{repo}/contents/#{path}"
+  end
+
   describe "#schema" do
     it "hits the correct url" do
       allow(subject).to receive(:open) do |url, _|
-        expect(url).to eq(
-          "https://api.github.com/repos/#{owner}/#{repo}/contents/#{path}"
-        )
+        expect(url).to eq(expected_url)
         schema
       end
 
@@ -36,9 +39,7 @@ describe Slodd::Github do
 
       it "hits a url including the ref param" do
         allow(subject).to receive(:open) do |url, _|
-          expect(url).to eq(
-            "https://api.github.com/repos/#{owner}/#{repo}/contents/#{path}?ref=#{ref}"
-          )
+          expect(url).to eq(expected_url + "?ref=#{ref}")
           schema
         end
 

data/spec/lib/http_spec.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe Slodd::Http do
+  let(:url) { double }
+  let(:schema_file) { double(read: "the schema") }
+  subject { described_class.new(url: url) }
+
+  describe "#schema" do
+    it "downloads the schema from the url given" do
+      expect(subject).to receive(:open).with(url).and_return(schema_file)
+      expect(subject.schema).to eq "the schema"
+    end
+  end
+end

data/spec/lib/local_spec.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe Slodd::Local do
+  subject { described_class.new(path: schema_path) }
+
+  describe "#schema" do
+    it "reads the file" do
+      expect(subject.schema).to eq File.read(schema_path)
+    end
+  end
+end

data/spec/lib/runner_spec.rb

@@ -0,0 +1,71 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe Slodd::Runner do
+  subject { described_class }
+
+  describe "#run" do
+    before do
+      Slodd::Config.path = schema_path
+      Slodd::Config.databases = "slodd_test"
+    end
+
+    after do
+      Slodd::Config.reset
+    end
+
+    it "creates the database ready for testing" do
+      output = capture_stdout do
+        subject.run!
+      end
+
+      expect(output).to match(/create_database\(slodd_test\)/)
+
+      expect(Test.count).to eq 0
+      Test.create(name: "James")
+
+      expect(Test.count).to eq 1
+      expect(Test.last.name).to eq "James"
+      expect(`mysql -uroot -e "show databases;"`).to match(/slodd_test/)
+
+      subject.run!
+
+      expect(Test.count).to eq 0
+    end
+
+    context "with multiple databases" do
+      before do
+        Slodd::Config.databases = "slodd_test slodd_test_2"
+      end
+
+      it "creates both databases" do
+        output = capture_stdout do
+          subject.run!
+        end
+
+        expect(output).to match(/create_database\(slodd_test\)/)
+        expect(output).to match(/create_database\(slodd_test_2\)/)
+
+        databases = `mysql -uroot -e "show databases;"`
+        expect(databases).to match(/slodd_test/)
+        expect(databases).to match(/slodd_test_2/)
+      end
+    end
+
+    context "when something is failing" do
+      before do
+        allow(ActiveRecord::Base).to receive(:establish_connection)
+                                       .and_raise(Mysql2::Error, "mysql error")
+      end
+
+      it "ouputs a usefull message to stderr" do
+        message = capture_stderr do
+          subject.run!
+        end
+        expect(message).to match(/mysql error/)
+      end
+    end
+  end
+end
+
+class Test < ActiveRecord::Base; end

data/spec/spec_helper.rb

@@ -1,9 +1,51 @@
-require 'slodd'
+# encoding: utf-8
+require "simplecov"
+SimpleCov.minimum_coverage 100
+SimpleCov.start
+
+require "slodd"
+require "stringio"
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
-  config.order = 'random'
+  config.order = "random"
+end
+
+module Slodd
+  module Config
+    def self.reset
+      defaults
+      self.github = nil
+      self.password = nil
+      self.url = nil
+      self.token = nil
+      self.ref = nil
+    end
+  end
+end
+
+def capture_stderr
+  old_stderr = $stderr
+  fake_stderr = StringIO.new
+  $stderr = fake_stderr
+  yield
+  fake_stderr.string
+ensure
+  $stderr = old_stderr
+end
+
+def capture_stdout
+  old_stdout = $stdout
+  fake_stdout = StringIO.new
+  $stdout = fake_stdout
+  yield
+  fake_stdout.string
+ensure
+  $stdout = old_stdout
 end
 
+def schema_path
+  File.join(File.dirname(__FILE__), "support", "schema.rb")
+end

data/spec/support/schema.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+ActiveRecord::Schema.define(version: 1) do
+  create_table "tests", force: true do |t|
+    t.string   "name"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slodd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -75,6 +75,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Schema Loading On Dependent Databases
 email:
 - ed.robinson@reevoo.com
@@ -85,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rubocop.yml
 - .travis.yml
 - Gemfile
 - README.md
@@ -101,8 +134,12 @@ files:
 - slodd.gemspec
 - spec/lib/config_spec.rb
 - spec/lib/gitub_spec.rb
+- spec/lib/http_spec.rb
+- spec/lib/local_spec.rb
+- spec/lib/runner_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+- spec/support/schema.rb
+homepage: https://github.com/errm/slodd
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -116,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2439965077187413609
+      hash: -4230072505507451069
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -125,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2439965077187413609
+      hash: -4230072505507451069
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -135,4 +172,8 @@ summary: Schema Loading On Dependent Databases
 test_files:
 - spec/lib/config_spec.rb
 - spec/lib/gitub_spec.rb
+- spec/lib/http_spec.rb
+- spec/lib/local_spec.rb
+- spec/lib/runner_spec.rb
 - spec/spec_helper.rb
+- spec/support/schema.rb