Back to require relative

Joel AZEMAR committed Apr 14, 2014
commit 75326e4370d173c0d83f5df2f934996bd3ce21c6
Showing 4 changed files with 21 additions and 7 deletions
Gemfile +5 -0
@@ @@ -2,6 +2,11 @@ source 'https://rubygems.org'
gemspec
+ group :development do
+ gem 'locomotivecms_common', path: '../common'
+ gem 'thin'
+ end
+
group :test do
gem 'pry'
gem 'coveralls', require: false
Gemfile.lock +13 -0
@@ @@ -13,6 +13,11 @@ PATH
sprockets-sass (~> 1.0)
will_paginate (~> 3.0)
+ PATH
+ remote: ../common
+ specs:
+ locomotivecms_common (0.0.1)
+
GEM
remote: https://rubygems.org/
specs:
@@ @@ -42,11 +47,13 @@ GEM
thor
crack (0.4.2)
safe_yaml (~> 1.0.0)
+ daemons (1.1.9)
diff-lcs (1.2.5)
docile (1.1.3)
dragonfly (1.0.4)
multi_json (~> 1.0)
rack
+ eventmachine (1.0.3)
execjs (2.0.2)
fssm (0.2.10)
haml (4.0.5)
@@ @@ -140,6 +147,10 @@ GEM
stringex (2.0.11)
term-ansicolor (1.3.0)
tins (~> 1.0)
+ thin (1.6.2)
+ daemons (>= 1.0.9)
+ eventmachine (>= 1.0.0)
+ rack (>= 1.0.0)
thor (0.18.1)
tilt (1.4.1)
tins (1.0.0)
@@ @@ -159,10 +170,12 @@ DEPENDENCIES
coveralls
i18n-spec
launchy
+ locomotivecms_common!
locomotivecms_steam!
pry
rack-test
rake (~> 10.1)
rspec (~> 2.14)
+ thin
vcr
webmock
locomotive/steam/standalone_server.rb b/lib/locomotive/steam/standalone_server.rb +2 -2
@@ @@ -1,6 +1,6 @@
- $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../..'))
+ require 'rubygems'
+ require 'bundler/setup'
- require_relative 'logger'
require_relative 'version'
require_relative 'exceptions'
require_relative 'server'
locomotivecms_steam.gemspec +1 -5
@@ @@ -1,8 +1,4 @@
- # encoding: utf-8
- lib = File.expand_path('../lib/', __FILE__)
- $:.unshift lib unless $:.include?(lib)
-
- require 'locomotive/steam/version'
+ require_relative 'lib/steam'
Gem::Specification.new do |spec|
spec.name = 'locomotivecms_steam'