Merge branch 'release-0.1.0' into help_develop

Conflicts:
	.gitignore

4 files changed, 18 insertions, 13 deletions

diff --git a/help/Rakefile b/help/Rakefile
index 9306287..0e73163 100644
--- a/help/Rakefile
+++ b/help/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_help.gemspec'))
+Gem::PackageTask.new(spec) do |p|
+    p.gem_spec = spec
+end
 
 Bundler::GemHelper.install_tasks
 
diff --git a/help/Readme.md b/help/Readme.md
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/help/Readme.md
diff --git a/help/leap_web_help.gemspec b/help/leap_web_help.gemspec
index 19b59d7..2cc147c 100644
--- a/help/leap_web_help.gemspec
+++ b/help/leap_web_help.gemspec
@@ -1,24 +1,23 @@
 $:.push File.expand_path("../lib", __FILE__)
 
-# Maintain your gem's version:
-require "leap_web_help/version"
 require "leap_web_core/dependencies"
+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_help"
-  s.version     = LeapWebHelp::VERSION
-  s.authors     = ["TODO: Your name"]
-  s.email       = ["TODO: Your email"]
-  s.homepage    = "TODO"
-  s.summary     = "TODO: Summary of LeapWebHelp."
-  s.description = "TODO: Description of LeapWebHelp."
+  s.version     = LeapWeb::VERSION
+  s.authors     = ["Jessib"]
+  s.email       = ["jessib@leap.se"]
+  s.homepage    = "http://www.leap.se"
+  s.summary     = "Help Desk for LeapWeb"
+  s.description = "Managing Tickets for a Leap provider"
 
-  s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
+  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}"
  
   LeapWebCore::Dependencies.add_ui_gems_to_spec(s)
   
diff --git a/help/test/test_helper.rb b/help/test/test_helper.rb
index 1e26a31..3381f44 100644
--- a/help/test/test_helper.rb
+++ b/help/test/test_helper.rb
@@ -1,7 +1,7 @@
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require File.expand_path('../../../test/dummy/config/environment', __FILE__)
 require "rails/test_help"
 
 Rails.backtrace_cleaner.remove_silencers!