rest-assured 0.2.0.rc7 → 0.2.0.rc8

data/Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    rest-assured (0.2.0.rc6)
+    rest-assured (0.2.0.rc7)
       activerecord (~> 3.1.0)
       activeresource (~> 3.1.0)
       haml (>= 3.1.3)
       rack-flash (>= 0.1.2)
-      sass (>= 3.1.8)
       sinatra (>= 1.3.1)
 
 GEM
@@ -96,7 +95,6 @@ GEM
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     rubyzip (0.9.4)
-    sass (3.1.10)
     selenium-webdriver (2.9.1)
       childprocess (>= 0.2.1)
       ffi (= 1.0.9)
@@ -104,9 +102,9 @@ GEM
       rubyzip
     shoulda-matchers (1.0.0.beta3)
     sinatra (1.3.1)
-      rack (>= 1.3.4, ~> 1.3)
-      rack-protection (>= 1.1.2, ~> 1.1)
-      tilt (>= 1.3.3, ~> 1.3)
+      rack (~> 1.3, >= 1.3.4)
+      rack-protection (~> 1.1, >= 1.1.2)
+      tilt (~> 1.3, >= 1.3.3)
     sinatra-activerecord (0.1.3)
       sinatra (>= 0.9.4)
     spoon (0.0.1)

data/bin/rest-assured

@@ -6,39 +6,58 @@ require 'rubygems'
 require 'optparse'
 require 'rest-assured/config'
 
+user_opts = {}
+
 OptionParser.new do |opts|
   opts.banner = "Usage: rest-assured [options]"
 
   opts.on('-a', '--adapter mysql|sqlite') do |adapter|
-    AppConfig[:adapter] = adapter
+    user_opts[:adapter] = adapter
+  end
+
+  opts.on('-d', '--database FILENAME', "Either path to database file (sqlite, defaults to ./rest-assured.db) or db name (defaults to rest_assured)") do |fname|
+    user_opts[:database] = fname
   end
 
-  opts.on('-d', '--database FILENAME', "Path to database file. Defaults to ./rest-assured.db. There is a special value ':memory:' for in memory database.") do |fname|
-    AppConfig[:database] = fname
+  opts.on('-u', '--dbuser DBUSER', "Db username (mysql only)") do |user|
+    user_opts[:user] = user
   end
 
-  opts.on('--user', "Db username") do |uname|
-    AppConfig[:db_user] = uname
+  opts.on('--dbpass DBPASSWORD', 'Db password (mysql only). Defaults to empty') do |password|
+    user_opts[:dbpass] = password
   end
 
-  opts.on('--password', 'Db password') do |password|
-    AppConfig[:db_password] = password
+  opts.on('--dbhost DBHOST', 'Db host (mysql only). Defaults to mysql default host (localhost)') do |dbhost|
+    user_opts[:dbhost] = dbhost
+  end
+
+  opts.on('--dbport DBPORT', Integer, 'Db port (mysql only). Defaults to mysql default port (3306)') do |dbport|
+    user_opts[:dbport] = dbport
+  end
+
+  opts.on('--dbencoding DBENCODING', 'Db encoding (mysql only). Defaults to mysql default encoding') do |dbencoding|
+    user_opts[:dbencoding] = dbencoding
+  end
+
+  opts.on('--dbsocket DBSOCKET', 'Db socket (mysql only). Defaults to mysql default socket') do |dbsocket|
+    user_opts[:dbsocket] = dbsocket
   end
 
   opts.on('-p', '--port PORT', Integer, "Server port. Defaults to 4578") do |port|
-    AppConfig[:port] = port
+    user_opts[:port] = port
   end
 
-  opts.on('-l', '--logfile FILENAME', "Path to logfile. Defaults to ./rest-assured.log") do |log_file|
-    AppConfig[:log_file] = log_file
+  opts.on('-l', '--logfile FILENAME', "Path to logfile. Defaults to ./rest-assured.log") do |logfile|
+    user_opts[:logfile] = logfile
   end
 
-  opts.on_tail("-h", "--help", "Show this message") do
+  opts.on_tail("--help", "Show this message") do
     puts opts
     exit
   end
 end.parse!
 
-require 'rest-assured'
+RestAssured::Config.build(user_opts)
 
+require 'rest-assured'
 RestAssured::Application.run!

data/features/call_history.feature

@@ -8,7 +8,6 @@ Feature: check double's call history
     When I request call history for that double
     Then it should be empty
 
-  @now
   Scenario: some calls made to double
     Given there is a double
     When that double gets requested

data/features/command_line_options.feature

@@ -0,0 +1,55 @@
+Feature: command line options
+  In order to run rest-assured in different configurations (db params, port, etc)
+  As test developer
+  I need a way to specify those configurations.
+
+  Scenario Outline: specifying server port
+    When I start rest-assured with <option>
+    Then it should run on port <port>
+
+    Examples:
+      | option      | port |
+      | -p 1234     | 1234 |
+      | --port 1235 | 1235 |
+      |             | 4578 |
+
+  Scenario Outline: specifying log file
+    When I start rest-assured with <option>
+    Then the log file should be <logfile>
+
+    Examples:
+      | option                   | logfile               |
+      | -l /tmp/rest-assured.log | /tmp/rest-assured.log |
+      | --logfile ./test.log     | ./test.log            |
+      |                          | ./rest-assured.log    |
+
+  Scenario Outline: sqlite options
+    When I start rest-assured with <options>
+    Then database adapter should be sqlite and db file should be <dbfile>
+
+    Examples:
+      | options                  | dbfile            |
+      |                          | ./rest-assured.db |
+      | -d /tmp/ratest.db        | /tmp/ratest.db    |
+      | --database /tmp/resta.db | /tmp/resta.db     |
+
+  @now
+  Scenario Outline: mysql options
+    When I start rest-assured with -a mysql <options>
+    Then database options should be:
+      | dbname   | dbuser   | dbpass   | dbhost   | dbport   | dbencoding   | dbsocket   |
+      | <dbname> | <dbuser> | <dbpass> | <dbhost> | <dbport> | <dbencoding> | <dbsocket> |
+
+    Examples:
+      | options                    | dbname       | dbuser | dbpass | dbhost | dbport | dbencoding | dbsocket        |
+      |                            | rest_assured | root   |        |        |        |            |                 |
+      | -d resta                   | resta        | root   |        |        |        |            |                 |
+      | --database resta           | resta        | root   |        |        |        |            |                 |
+      | -u bob                     | rest_assured | bob    |        |        |        |            |                 |
+      | --dbuser bob               | rest_assured | bob    |        |        |        |            |                 |
+      | --dbpass pswd              | rest_assured | root   | pswd   |        |        |            |                 |
+      | --dbhost remote            | rest_assured | root   |        | remote |        |            |                 |
+      | --dbport 5555              | rest_assured | root   |        |        | 5555   |            |                 |
+      | --dbencoding utf16le       | rest_assured | root   |        |        |        | utf16le    |                 |
+      | --dbsocket /tmp/mysql.sock | rest_assured | root   |        |        |        |            | /tmp/mysql.sock |
+

data/features/step_definitions/command_line_options_steps.rb

@@ -0,0 +1,35 @@
+When /^I start rest\-assured with (.*)$/ do |options|
+  @app_config = fake_start_rest_assured(options)
+end
+
+Then /^it should run on port (\d+)$/ do |port|
+  @app_config[:port].should == port
+end
+
+Then /^the log file should be (.*)$/ do |logfile|
+  @app_config[:logfile].should == logfile
+  `rm #{logfile}`
+end
+
+Then /^database adapter should be sqlite and db file should be (.*)$/ do |dbfile|
+  @app_config[:db_config][:database].should == dbfile
+  @app_config[:db_config][:adapter].should == 'sqlite3'
+  `rm #{dbfile}`
+end
+
+Then /^database options should be:$/ do |table|
+  res = table.hashes.first
+
+  empty_to_nil = lambda do |string|
+    string.empty? ? nil : string
+  end
+  
+  @app_config[:db_config][:adapter].should == 'mysql'
+  @app_config[:db_config][:database].should == res['dbname']
+  @app_config[:db_config][:user].should == res['dbuser']
+  @app_config[:db_config][:password].should == empty_to_nil[res['dbpass']]
+  @app_config[:db_config][:host].should == empty_to_nil[res['dbhost']]
+  @app_config[:db_config][:port].should == empty_to_nil[res['dbport']].try(:to_i)
+  @app_config[:db_config][:encoding].should == empty_to_nil[res['dbencoding']]
+  @app_config[:db_config][:socket].should == empty_to_nil[res['dbsocket']]
+end

data/features/step_definitions/doubles_steps.rb

@@ -14,6 +14,10 @@ When /^I create a double with "([^""]*)" as fullpath, "([^""]*)" as response con
   last_response.should be_ok
 end
 
+Then /^I should get (#{CAPTURE_A_NUMBER}) in response status$/ do |status|
+  last_response.status.should == status
+end
+
 Then /^there should be (#{CAPTURE_A_NUMBER}) double with "([^"]*)" as fullpath and "([^"]*)" as response content$/ do |n, fullpath, content|
   Double.where(:fullpath => fullpath, :content => content).count.should == n
 end

data/features/support/env.rb

@@ -9,6 +9,7 @@ Spork.prefork do
   require 'capybara/firebug'
   require 'capybara/cucumber'
   require 'database_cleaner'
+  require File.dirname(__FILE__) + '/world_helpers'
 
   ENV['RACK_ENV'] = 'test'
 
@@ -32,14 +33,14 @@ Spork.prefork do
     Capybara::Selenium::Driver.new(app, :browser => :firefox, :profile => profile) 
   end
 
-  World(Capybara, Rack::Test::Methods, RackHeaderHack)
+  World(Capybara, Rack::Test::Methods, RackHeaderHack, WorldHelpers)
 
 end
 
 
 Spork.each_run do
   require 'rest-assured/config'
-  AppConfig[:adapter] = 'mysql'
+  RestAssured::Config.build(:adapter => 'mysql')
 
   require 'rest-assured'
   require 'rest-assured/client'

data/features/support/world_helpers.rb

@@ -0,0 +1,31 @@
+require 'yaml'
+require 'open3'
+
+module WorldHelpers
+  def fake_start_rest_assured(options)
+    rest_assured_exec = File.expand_path '../../../bin/rest-assured', __FILE__
+    code = File.read rest_assured_exec
+
+    code.sub!(/(.*)/, "\\1\nENV['RACK_ENV'] = 'production'")
+    code.sub!(/require 'rest-assured'/, '')
+    code.sub!(/RestAssured::Application.run!/, 'puts AppConfig.to_yaml')
+
+    new_exec = "#{rest_assured_exec}_temp"
+    File.open(new_exec, 'w') do |file|
+      file.write code
+    end
+
+    `chmod +x #{new_exec}`
+
+    # this is 1.9.X version. So much more useful than 1.8 (uncommented). Sigh...
+    #config_yaml, stderr_str, status = Open3.capture3({'RACK_ENV' => 'production'}, new_exec, *options.split(' '))
+    config_yaml = nil
+    Open3.popen3(new_exec, *options.split(' ')) do |stdin, stdout, stderr|
+      config_yaml = stdout.read
+    end
+
+    `rm #{new_exec}`
+
+    YAML.load(config_yaml)
+  end
+end

data/lib/rest-assured.rb

@@ -1,11 +1,9 @@
 require 'rubygems'
 require 'sinatra/base'
 require 'haml'
-require 'sass'
 require 'rack-flash'
 require 'sinatra/partials'
-require 'active_record'
-require 'rest-assured/init'
+require 'rest-assured/config'
 require 'rest-assured/models/double'
 require 'rest-assured/models/redirect'
 require 'rest-assured/models/request'
@@ -15,16 +13,10 @@ require 'rest-assured/routes/response'
 
 module RestAssured
   class Application < Sinatra::Base
-    set :environment, AppConfig[:environment]
-    set :port, AppConfig[:port]
 
-    enable :method_override
+    include RestAssured::Config
 
-    Logger.class_eval do
-      alias_method :write, :<<
-    end
-    enable :logging
-    use Rack::CommonLogger, $app_logger
+    enable :method_override
 
     enable :sessions
     use Rack::Flash, :sweep => true
@@ -44,15 +36,6 @@ module RestAssured
     include DoubleRoutes
     include RedirectRoutes
 
-    #before do
-      #ActiveRecord::Base.clear_reloadable_connections!
-      #ActiveRecord::Base.clear_cache! 
-    #end
-
-    get '/css/base.css' do
-      scss :base
-    end
-
     %w{get post put delete}.each do |verb|
       send verb, /.*/ do
         Response.perform(self)

data/lib/rest-assured/config.rb

@@ -1,13 +1,138 @@
-#default config values are set here
-
-AppConfig = {
-  :port => 4578,
-  :environment => ENV['RACK_ENV'] || 'production',
-  :adapter => 'sqlite'
-}
-
-AppConfig[:log_file] = if AppConfig[:environment] == 'production'
-                         './rest-assured.log'
-                       else
-                         File.expand_path("../../../#{AppConfig[:environment]}.log", __FILE__)
-                       end
+require 'logger'
+require 'active_record'
+require 'active_support/core_ext/kernel/reporting'
+
+module RestAssured
+  module Config
+    class ConfigHash < Hash
+      def initialize(default_values = {})
+        super()
+        self.merge!(default_values)
+      end
+
+      def method_missing(meth, *args)
+        meth = meth.to_s
+
+        if meth.sub!(/=/, '')
+          self[meth.to_sym] = args.first
+        else
+          self[meth.to_sym]
+        end
+      end
+    end
+
+    ::AppConfig = ConfigHash.new({
+      :port => 4578,
+      :environment => ENV['RACK_ENV'] || 'production',
+      :adapter => 'sqlite'
+    })
+
+    # this is meant to be called prior to include
+    def self.build(opts = {})
+      AppConfig.merge!(opts)
+
+      AppConfig.logfile ||= if AppConfig.environment == 'production'
+                              './rest-assured.log'
+                            else
+                              File.expand_path("../../../#{AppConfig.environment}.log", __FILE__)
+                            end
+      build_db_config
+    end
+
+    def self.included(klass)
+      init_logger
+      setup_db
+
+      klass.set :port, AppConfig.port
+      klass.set :environment, AppConfig.environment
+
+      klass.enable :logging
+      klass.use Rack::CommonLogger, AppConfig.logger
+    end
+
+    private
+
+      def self.setup_db
+        setup_db_logging
+        connect_db
+        migrate_db
+      end
+
+      def self.init_logger
+        Logger.class_eval do
+          alias_method :write, :<<
+        end
+
+        AppConfig.logger = Logger.new(AppConfig.logfile)
+        AppConfig.logger.level = Logger::DEBUG
+      end
+
+      def self.setup_db_logging
+        raise "Init logger first" unless AppConfig.logger
+
+        # active record logging is purely internal
+        # thus disabling it for production
+        ActiveRecord::Base.logger = if AppConfig.environment == 'production'
+                                      Logger.new(dev_null)
+                                    else
+                                      AppConfig.logger
+                                    end
+      end
+
+      def self.dev_null
+        test('e', '/dev/null') ? '/dev/null' : 'NUL:'
+      end
+
+      def self.connect_db
+        ActiveRecord::Base.establish_connection AppConfig.db_config
+      end
+
+      def self.migrate_db
+        migrate = lambda { ActiveRecord::Migrator.migrate(File.expand_path('../../../db/migrate', __FILE__)) }
+
+        if AppConfig[:environment] == 'production' && Kernel.respond_to?(:silence)
+          silence(:stdout, &migrate)
+        else
+          migrate.call
+        end
+      end
+
+      def self.build_db_config
+        AppConfig.db_config = if AppConfig.adapter =~ /sqlite/i
+                                default_database = if AppConfig.environment == 'production'
+                                                     './rest-assured.db'
+                                                   else
+                                                     File.expand_path("../../../db/#{AppConfig.environment}.db", __FILE__)
+                                                   end
+                                {
+                                  :adapter => 'sqlite3',
+                                  :database => AppConfig.database || default_database
+                                }
+                              elsif AppConfig.adapter =~ /mysql/i
+                                default_database = if AppConfig.environment != 'production'
+                                                     "rest_assured_#{AppConfig.environment}"
+                                                   else
+                                                     'rest_assured'
+                                                   end
+
+                                opts = {
+                                  :adapter => 'mysql',
+                                  :reconnect => true,
+                                  :user => AppConfig.user || 'root',
+                                  :database => AppConfig.database || default_database
+                                }
+
+                                opts[:password] = AppConfig.dbpass if AppConfig.dbpass
+                                opts[:host] = AppConfig.dbhost if AppConfig.dbhost
+                                opts[:port] = AppConfig.dbport if AppConfig.dbport
+                                opts[:encoding] = AppConfig.dbencoding if AppConfig.dbencoding
+                                opts[:socket] = AppConfig.dbsocket if AppConfig.dbsocket
+                                opts
+                              else
+                                raise "Unsupported db adapter '#{AppConfig.adapter}'. Valid adapters are sqlite and mysql"
+                              end
+      end
+  end
+end
+
+

data/lib/rest-assured/version.rb

@@ -1,3 +1,3 @@
 module RestAssured
-  VERSION = '0.2.0.rc7'
+  VERSION = '0.2.0.rc8'
 end

data/rest-assured.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'sinatra', '>= 1.3.1'
   s.add_dependency 'rack-flash', '>= 0.1.2'
   s.add_dependency 'haml', '>= 3.1.3'
-  s.add_dependency 'sass', '>= 3.1.8'
   s.add_dependency 'activerecord', '~> 3.1.0'
   s.add_dependency 'activeresource', '~> 3.1.0'
 end

data/spec/config_spec.rb

@@ -0,0 +1,98 @@
+require File.expand_path('../../lib/rest-assured/config', __FILE__)
+require 'rack'
+
+describe RestAssured::Config do
+  #this is thoroughly covered in cucumber (since there it also serves documentation purposes)
+  #it 'builds config from user options'
+
+  it 'initializes logger' do
+    logger = double(:logger).as_null_object
+    AppConfig.stub(:logfile).and_return('test.log')
+
+    Logger.should_receive(:new).with('test.log').and_return(logger)
+
+    RestAssured::Config.init_logger
+  end
+
+  context 'db setup' do
+    it 'connects db' do
+      RestAssured::Config.stub(:migrate_db) # so it does not complain
+      AppConfig.stub(:db_config).and_return('db_config')
+
+      ActiveRecord::Base.should_receive(:establish_connection).with('db_config')
+
+      RestAssured::Config.setup_db
+    end
+
+    context 'active_record logging' do
+      let(:logger) { double(:logger).as_null_object }
+
+      before do
+        RestAssured::Config.stub(:migrate_db)
+        RestAssured::Config.stub(:connect_db)
+      end
+
+      it 'is silenced in production' do
+        AppConfig.stub(:environment).and_return('production')
+        Logger.should_receive(:new).with(RestAssured::Config.dev_null).and_return(logger)
+
+        ActiveRecord::Base.should_receive(:logger=).with(logger)
+
+        RestAssured::Config.setup_db
+      end
+
+      it 'is set to app logger for non production' do
+        AppConfig.stub(:environment).and_return('test')
+        AppConfig.stub(:logger).and_return(logger)
+
+        ActiveRecord::Base.should_receive(:logger=).with(logger)
+
+        RestAssured::Config.setup_db
+      end
+    end
+
+    it 'runs migrations' do
+      RestAssured::Config.stub(:connect_db) # so it does not complain
+
+      ActiveRecord::Migrator.should_receive(:migrate)
+
+      RestAssured::Config.setup_db
+    end
+  end
+
+  context 'when included in RestAssured::Application' do
+    let(:app) { mock(:app).as_null_object }
+
+    before do
+      RestAssured::Config.build
+    end
+
+    it 'initializes resources' do
+      RestAssured::Config.should_receive(:init_logger)
+      RestAssured::Config.should_receive(:setup_db)
+
+      RestAssured::Config.included(app)
+    end
+
+    it 'sets up environment' do
+      app.should_receive(:set).with(:environment, AppConfig.environment)
+      RestAssured::Config.included(app)
+    end
+
+    it 'sets up port' do
+      app.should_receive(:set).with(:port, AppConfig.port)
+      RestAssured::Config.included(app)
+    end
+
+    it 'connects logger' do
+      logger = double(:logger).as_null_object
+      AppConfig.stub(:logger).and_return(logger)
+
+      app.should_receive(:enable).with(:logging)
+      app.should_receive(:use).with(Rack::CommonLogger, logger)
+
+      RestAssured::Config.included(app)
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -44,7 +44,7 @@ end
 
 Spork.each_run do
   require 'rest-assured/config'
-  AppConfig[:adapter] = 'mysql'
+  RestAssured::Config.build(:adapter => 'mysql')
 
   require 'rest-assured'
   require 'rest-assured/client'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rest-assured
 version: !ruby/object:Gem::Version 
-  hash: 15424059
+  hash: 15424037
   prerelease: 6
   segments: 
   - 0
   - 2
   - 0
   - rc
-  - 7
-  version: 0.2.0.rc7
+  - 8
+  version: 0.2.0.rc8
 platform: ruby
 authors: 
 - Artem Avetisyan
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-24 00:00:00 Z
+date: 2011-11-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -67,26 +67,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sass
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 1
-        - 8
-        version: 3.1.8
-  type: :runtime
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -98,11 +82,11 @@ dependencies:
         - 0
         version: 3.1.0
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: activeresource
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -114,7 +98,7 @@ dependencies:
         - 0
         version: 3.1.0
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 description: 
 email: 
 - artem.avetisyan@bbc.co.uk
@@ -147,24 +131,25 @@ files:
 - db/migrate/20111016174101_rename_method_to_verb.rb
 - db/migrate/20111021113953_add_status_to_doubles.rb
 - features/call_history.feature
+- features/command_line_options.feature
 - features/doubles_via_api.feature
 - features/doubles_via_ui.feature
 - features/redirect_rules_via_api.feature
 - features/redirect_rules_via_ui.feature
 - features/step_definitions/call_history_steps.rb
+- features/step_definitions/command_line_options_steps.rb
 - features/step_definitions/doubles_steps.rb
-- features/step_definitions/persistence_steps.rb
 - features/step_definitions/redirect_rules_steps.rb
 - features/step_definitions/support/numeric_transforms.rb
 - features/support/env.rb
 - features/support/selenium-fix.rb
 - features/support/test-server.rb
+- features/support/world_helpers.rb
 - lib/active_record/leaky_connections_patch.rb
 - lib/rest-assured.rb
 - lib/rest-assured/client.rb
 - lib/rest-assured/client/resources.rb
 - lib/rest-assured/config.rb
-- lib/rest-assured/init.rb
 - lib/rest-assured/models/double.rb
 - lib/rest-assured/models/redirect.rb
 - lib/rest-assured/models/request.rb
@@ -173,6 +158,7 @@ files:
 - lib/rest-assured/routes/response.rb
 - lib/rest-assured/version.rb
 - lib/sinatra/partials.rb
+- public/css/base.css
 - public/css/grid.inuit.css
 - public/css/inuit.css
 - public/css/jquery.jgrowl.css
@@ -190,6 +176,7 @@ files:
 - public/javascript/jquery.jgrowl_minimized.js
 - rest-assured.gemspec
 - spec/client/resource_double_spec.rb
+- spec/config_spec.rb
 - spec/custom_matchers.rb
 - spec/functional/double_routes_spec.rb
 - spec/functional/redirect_routes_spec.rb
@@ -198,7 +185,6 @@ files:
 - spec/models/redirect_spec.rb
 - spec/models/request_spec.rb
 - spec/spec_helper.rb
-- views/base.scss
 - views/doubles/_form.haml
 - views/doubles/edit.haml
 - views/doubles/index.haml
@@ -247,19 +233,22 @@ specification_version: 3
 summary: A tool for high level mocking/stubbing HTTP based REST services
 test_files: 
 - features/call_history.feature
+- features/command_line_options.feature
 - features/doubles_via_api.feature
 - features/doubles_via_ui.feature
 - features/redirect_rules_via_api.feature
 - features/redirect_rules_via_ui.feature
 - features/step_definitions/call_history_steps.rb
+- features/step_definitions/command_line_options_steps.rb
 - features/step_definitions/doubles_steps.rb
-- features/step_definitions/persistence_steps.rb
 - features/step_definitions/redirect_rules_steps.rb
 - features/step_definitions/support/numeric_transforms.rb
 - features/support/env.rb
 - features/support/selenium-fix.rb
 - features/support/test-server.rb
+- features/support/world_helpers.rb
 - spec/client/resource_double_spec.rb
+- spec/config_spec.rb
 - spec/custom_matchers.rb
 - spec/functional/double_routes_spec.rb
 - spec/functional/redirect_routes_spec.rb

data/features/step_definitions/persistence_steps.rb

@@ -1,13 +0,0 @@
-Given /^I (?:re)?start service without \-\-database option$/ do
-  AppConfig[:database] = ':memory:' #default value
-  load 'rest-assured/init.rb'
-end
-
-Then /^I should get (#{CAPTURE_A_NUMBER}) in response status$/ do |status|
-  last_response.status.should == status
-end
-
-Given /^I (?:re)?start service with \-\-database "([^"]*)" option$/ do |db_path|
-  AppConfig[:database] = db_path
-  load 'rest-assured/init.rb'
-end

data/lib/rest-assured/init.rb

@@ -1,78 +0,0 @@
-require 'active_record'
-#require 'active_record/leaky_connections_patch'
-#require 'active_record/sqlite_transaction_hell_patch'
-require 'rest-assured/config'
-require 'logger'
-require 'active_support/core_ext/kernel/reporting'
-
-module RestAssured
-  class Init
-    def self.init!
-      setup_logger
-      connect_db
-      migrate_db
-    end
-
-    private
-      def self.build_db_config
-        if AppConfig[:adapter] =~ /sqlite/i
-          AppConfig[:database] ||= if AppConfig[:environment] == 'production'
-                                     './rest-assured.db'
-                                   else
-                                     File.expand_path("../../../db/#{AppConfig[:environment]}.db", __FILE__)
-                                   end
-          {
-            :adapter => 'sqlite3',
-            :database => AppConfig[:database]
-          }
-        elsif AppConfig[:adapter] =~ /mysql/i
-          AppConfig[:database] ||= if AppConfig[:environment] != 'production'
-                                     "rest_assured_#{AppConfig[:environment]}"
-                                   else
-                                     'rest_assured'
-                                   end
-          AppConfig[:db_user] ||= 'root'
-
-          {
-            :adapter => 'mysql',
-            :reconnect => true,
-            :user => AppConfig[:db_user],
-            :password => AppConfig[:db_password],
-            :database => AppConfig[:database]
-          }
-        else
-          raise "Unsupported db adapter '#{AppConfig[:adapter]}'. Valid adapters are sqlite and mysql"
-        end
-      end
-
-      def self.connect_db
-        config = build_db_config
-        ActiveRecord::Base.establish_connection config
-      end
-
-      def self.migrate_db
-        migrate = lambda { ActiveRecord::Migrator.migrate(File.expand_path('../../../db/migrate', __FILE__)) }
-
-        if AppConfig[:environment] == 'production' && Kernel.respond_to?(:silence)
-          silence(:stdout, &migrate)
-        else
-          migrate.call
-        end
-      end
-
-      def self.setup_logger
-        $app_logger = Logger.new(AppConfig[:log_file])
-        $app_logger.level = Logger::DEBUG
-
-        # active record logging is purely internal
-        # thus disabling it for production
-        ActiveRecord::Base.logger = if AppConfig[:environment] == 'production'
-                                      Logger.new(test('e', '/dev/null') ? '/dev/null' : 'NUL:')
-                                    else
-                                      $app_logger
-                                    end
-      end
-  end
-
-  Init.init!
-end