aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrhenium <rhenium@rhe.jp>2014-09-15 08:29:40 +0900
committerrhenium <rhenium@rhe.jp>2014-09-15 08:29:40 +0900
commitdd11a4d73182579e0ed3eb71d74440e6ac5e134b (patch)
tree456e42447632ee521e1763077f8d0060c3a04ae6
parente34c7758ef1d98b7747fc2b0c543b65201c3cdd1 (diff)
downloadaclog-dd11a4d73182579e0ed3eb71d74440e6ac5e134b.tar.gz
remove em-work_queue dependency
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
-rw-r--r--Guardfile1
-rw-r--r--LICENSE.txt1
4 files changed, 2 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index c042e46..d568ab9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,9 +22,9 @@ gem "dalli"
gem "omniauth-twitter"
gem "twitter"
gem "twitter-text"
+gem "eventmachine"
gem "msgpack"
gem "msgpack-rpc"
-gem "em-work_queue"
gem "pry-rails"
group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index c91e419..086fc0c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -82,8 +82,6 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
diff-lcs (1.2.5)
docile (1.1.5)
- em-work_queue (0.0.1)
- eventmachine
equalizer (0.0.9)
erubis (2.7.0)
eventmachine (1.0.3)
@@ -337,7 +335,7 @@ DEPENDENCIES
byebug
coveralls
dalli
- em-work_queue
+ eventmachine
factory_girl_rails
grape
grape-rabl
diff --git a/Guardfile b/Guardfile
index 8e24af4..acf7762 100644
--- a/Guardfile
+++ b/Guardfile
@@ -21,4 +21,3 @@ guard :rspec, cmd: "spring rspec" do
watch(%r{^spec/acceptance/(.+)\.feature$})
watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
end
-
diff --git a/LICENSE.txt b/LICENSE.txt
index c5933c4..41802af 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-