Permalink
Browse files

Doesn't rely on script/ci anymore

  • Loading branch information...
1 parent b12898a commit f5127adb69ea5f949760cd9df25778d3990fc503 @yokolet yokolet committed Mar 22, 2013
Showing with 36 additions and 65 deletions.
  1. +1 −1 .travis.yml
  2. +34 −34 Jarfile.lock
  3. +1 −2 diametric.gemspec
  4. +0 −28 script/ci
View
2 .travis.yml
@@ -1,7 +1,7 @@
language: ruby
#bundler_args: --without development
before_script: rake prepare
-script: ./script/ci
rvm:
- 1.9.3
- jruby-19mode
+script: INTEGRATION=true bundle exec rspec spec
View
68 Jarfile.lock
@@ -31,29 +31,29 @@ groups:
artifacts:
- jar:com.datomic:datomic-free:jar:0.8.3848:
transitive:
+ com.h2database:h2:jar:1.3.165: {}
+ org.apache.lucene:lucene-core:jar:3.3.0: {}
+ io.netty:netty:jar:3.6.0.Final: {}
+ net.java.dev.jets3t:jets3t:jar:0.8.1:
+ com.jamesmurty.utils:java-xmlbuilder:jar:0.4: {}
+ commons-httpclient:commons-httpclient:jar:3.1: {}
+ org.slf4j:jul-to-slf4j:jar:1.6.4:
+ org.slf4j:slf4j-api:jar:1.6.4: {}
+ org.slf4j:log4j-over-slf4j:jar:1.6.4: {}
+ com.google.guava:guava:jar:12.0.1:
+ com.google.code.findbugs:jsr305:jar:1.3.9: {}
+ org.slf4j:jcl-over-slf4j:jar:1.6.4: {}
+ org.codehaus.janino:commons-compiler-jdk:jar:2.6.1:
+ org.codehaus.janino:commons-compiler:jar:2.6.1: {}
+ org.clojure:clojure:jar:1.4.0: {}
com.amazonaws:aws-java-sdk:jar:1.3.0:
commons-codec:commons-codec:jar:1.3: {}
+ org.fressian:fressian:jar:0.6.3: {}
org.hornetq:hornetq-core:jar:2.2.21.Final: {}
- org.slf4j:jcl-over-slf4j:jar:1.6.4: {}
- com.google.guava:guava:jar:12.0.1:
- com.google.code.findbugs:jsr305:jar:1.3.9: {}
- io.netty:netty:jar:3.6.0.Final: {}
+ org.clojure:tools.cli:jar:0.2.2: {}
org.slf4j:slf4j-nop:jar:1.6.4: {}
- org.slf4j:log4j-over-slf4j:jar:1.6.4: {}
- org.fressian:fressian:jar:0.6.3: {}
- org.slf4j:jul-to-slf4j:jar:1.6.4:
- org.slf4j:slf4j-api:jar:1.6.4: {}
org.apache.tomcat:tomcat-jdbc:jar:7.0.27:
org.apache.tomcat:tomcat-juli:jar:7.0.27: {}
- com.h2database:h2:jar:1.3.165: {}
- org.clojure:clojure:jar:1.4.0: {}
- org.apache.lucene:lucene-core:jar:3.3.0: {}
- org.clojure:tools.cli:jar:0.2.2: {}
- org.codehaus.janino:commons-compiler-jdk:jar:2.6.1:
- org.codehaus.janino:commons-compiler:jar:2.6.1: {}
- net.java.dev.jets3t:jets3t:jar:0.8.1:
- commons-httpclient:commons-httpclient:jar:3.1: {}
- com.jamesmurty.utils:java-xmlbuilder:jar:0.4: {}
runtime:
dependencies:
- com.amazonaws:aws-java-sdk:jar:1.3.0
@@ -83,29 +83,29 @@ groups:
artifacts:
- jar:com.datomic:datomic-free:jar:0.8.3848:
transitive:
+ com.h2database:h2:jar:1.3.165: {}
+ org.apache.lucene:lucene-core:jar:3.3.0: {}
+ io.netty:netty:jar:3.6.0.Final: {}
+ net.java.dev.jets3t:jets3t:jar:0.8.1:
+ com.jamesmurty.utils:java-xmlbuilder:jar:0.4: {}
+ commons-httpclient:commons-httpclient:jar:3.1: {}
+ org.slf4j:jul-to-slf4j:jar:1.6.4:
+ org.slf4j:slf4j-api:jar:1.6.4: {}
+ org.slf4j:log4j-over-slf4j:jar:1.6.4: {}
+ com.google.guava:guava:jar:12.0.1:
+ com.google.code.findbugs:jsr305:jar:1.3.9: {}
+ org.slf4j:jcl-over-slf4j:jar:1.6.4: {}
+ org.codehaus.janino:commons-compiler-jdk:jar:2.6.1:
+ org.codehaus.janino:commons-compiler:jar:2.6.1: {}
+ org.clojure:clojure:jar:1.4.0: {}
com.amazonaws:aws-java-sdk:jar:1.3.0:
commons-codec:commons-codec:jar:1.3: {}
+ org.fressian:fressian:jar:0.6.3: {}
org.hornetq:hornetq-core:jar:2.2.21.Final: {}
- org.slf4j:jcl-over-slf4j:jar:1.6.4: {}
- com.google.guava:guava:jar:12.0.1:
- com.google.code.findbugs:jsr305:jar:1.3.9: {}
- io.netty:netty:jar:3.6.0.Final: {}
+ org.clojure:tools.cli:jar:0.2.2: {}
org.slf4j:slf4j-nop:jar:1.6.4: {}
- org.slf4j:log4j-over-slf4j:jar:1.6.4: {}
- org.fressian:fressian:jar:0.6.3: {}
- org.slf4j:jul-to-slf4j:jar:1.6.4:
- org.slf4j:slf4j-api:jar:1.6.4: {}
org.apache.tomcat:tomcat-jdbc:jar:7.0.27:
org.apache.tomcat:tomcat-juli:jar:7.0.27: {}
- com.h2database:h2:jar:1.3.165: {}
- org.clojure:clojure:jar:1.4.0: {}
- org.apache.lucene:lucene-core:jar:3.3.0: {}
- org.clojure:tools.cli:jar:0.2.2: {}
- org.codehaus.janino:commons-compiler-jdk:jar:2.6.1:
- org.codehaus.janino:commons-compiler:jar:2.6.1: {}
- net.java.dev.jets3t:jets3t:jar:0.8.1:
- commons-httpclient:commons-httpclient:jar:3.1: {}
- com.jamesmurty.utils:java-xmlbuilder:jar:0.4: {}
remote_repositories:
- http://clojars.org/repo/
- https://repository.jboss.org/nexus/content/groups/public/
View
3 diametric.gemspec
@@ -16,7 +16,7 @@ as entities into a Datomic database.
EOF
gem.homepage = "https://github.com/relevance/diametric"
- gem.files = %w(Gemfile Jarfile Jarfile.lock LICENSE.txt README.md Rakefile diametric.gemspec) + Dir.glob('lib/**/*') + Dir.glob('ext/**/*')
+ gem.files = %w(Gemfile Jarfile Jarfile.lock LICENSE.txt README.md Rakefile datomic_version.cnf diametric.gemspec) + Dir.glob('lib/**/*') + Dir.glob('ext/**/*')
gem.executables = []
gem.test_files = Dir.glob("spec/**/*.rb")
gem.require_paths = ["lib"]
@@ -28,7 +28,6 @@ EOF
gem.add_dependency 'rubyzip', '~> 0.9.9'
gem.add_dependency 'rspec', '~> 2.13.0'
gem.add_dependency 'lock_jar', '= 0.7.3' if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
- #gem.add_dependency 'lock_jar', '= 0.7.3'
gem.add_dependency 'jruby-openssl', '~> 0.8.2' if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
gem.add_development_dependency 'rake-compiler', '~> 0.8.2'
View
28 script/ci
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -e
-
-script/vendor-datomic-free
-pushd `ls -d -1 vendor/datomic/* | tail -n 1` > /dev/null
-
-echo "Starting local Datomic REST client"
-bin/rest -p 9000 free datomic:mem:// 2>&1 &
-child_pid=$!
-
-popd
-
-echo "Waiting for Datomic REST client to come up on port 9000"
-max_wait=60 # seconds to wait for bin/rest to come up
-while [ $max_wait -gt 0 ] && [ -z "`lsof -i :9000`" ]; do
- max_wait=$((max_wait-1))
- sleep 1
-done
-
-echo "Running specs..."
-INTEGRATION=true bundle exec rake spec
-
-# Clean up child processes
-for pid in `ps -ef | awk '$3 == '$child_pid' { print $2 }'`; do
- kill $pid
-done
-kill $child_pid

0 comments on commit f5127ad

Please sign in to comment.