diff options
| author | jessib <jessib@riseup.net> | 2012-10-08 11:05:17 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2012-10-08 11:05:17 -0700 |
| commit | 8f100d3c03a6f554e703c5d0b2fe221958424c26 (patch) | |
| tree | 77e90f53d05fecefa91adf89a3c35f19e277996b /certs | |
| parent | f77301824c42bdd4559a0b0e58b8f3c26f239643 (diff) | |
| parent | f5aea5347601c3500bb3670971d44995c35c3c7b (diff) | |
Merge branch 'release-0.1.0' into help_develop
Conflicts:
.gitignore
Diffstat (limited to 'certs')
| -rw-r--r-- | certs/Rakefile | 10 | ||||
| -rw-r--r-- | certs/leap_web_certs.gemspec | 9 | ||||
| -rw-r--r-- | certs/test/test_helper.rb | 2 |
3 files changed, 13 insertions, 8 deletions
diff --git a/certs/Rakefile b/certs/Rakefile index dd38158..54ed86d 100644 --- a/certs/Rakefile +++ b/certs/Rakefile @@ -1,4 +1,8 @@ #!/usr/bin/env rake + +require 'rake/packagetask' +require 'rubygems/package_task' + begin require 'bundler/setup' rescue LoadError @@ -20,8 +24,10 @@ RDoc::Task.new(:rdoc) do |rdoc| rdoc.rdoc_files.include('lib/**/*.rb') end - - +spec = eval(File.read('leap_web_certs.gemspec')) +Gem::PackageTask.new(spec) do |p| + p.gem_spec = spec +end Bundler::GemHelper.install_tasks diff --git a/certs/leap_web_certs.gemspec b/certs/leap_web_certs.gemspec index 28ef392..14708df 100644 --- a/certs/leap_web_certs.gemspec +++ b/certs/leap_web_certs.gemspec @@ -1,23 +1,22 @@ $:.push File.expand_path("../lib", __FILE__) -# Maintain your gem's version: -require "leap_web_certs/version" +require File.expand_path('../../lib/leap_web/version.rb', __FILE__) # Describe your gem and declare its dependencies: Gem::Specification.new do |s| s.name = "leap_web_certs" - s.version = LeapWebCerts::VERSION + s.version = LeapWeb::VERSION s.authors = ["Azul"] s.email = ["azul@leap.se"] s.homepage = "http://www.leap.se" s.summary = "Cert distribution for the leap platform" s.description = "This plugin for the leap platform distributes certs for the EIP client. It fetches the certs from a pool in CouchDB that is filled by leap-ca." - s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "Readme.md"] + s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "Readme.md"] s.test_files = Dir["test/**/*"] s.add_dependency "rails", "~> 3.2.8" - s.add_dependency "leap_web_core", "~> 0.0.1" + s.add_dependency "leap_web_core", LeapWeb::VERSION s.add_development_dependency "mocha" diff --git a/certs/test/test_helper.rb b/certs/test/test_helper.rb index b268c51..08d4d41 100644 --- a/certs/test/test_helper.rb +++ b/certs/test/test_helper.rb @@ -1,5 +1,5 @@ ENV["RAILS_ENV"] = "test" -require File.expand_path('../dummy/config/environment', __FILE__) +require File.expand_path('../../../test/dummy/config/environment', __FILE__) require 'rails/test_help' require 'mocha' |