Merge branch 'release-0.1.0' into develop

7 files changed, 27 insertions, 38 deletions

diff --git a/help/Gemfile b/help/Gemfile
index 8dfcd78..5e895e9 100644
--- a/help/Gemfile
+++ b/help/Gemfile
@@ -1,20 +1,15 @@
 source "http://rubygems.org"
 
-# Declare your gem's dependencies in leap_web_help.gemspec.
+eval(File.read(File.dirname(__FILE__) + '/../common_dependencies.rb'))
+eval(File.read(File.dirname(__FILE__) + '/..//ui_dependencies.rb'))
+
+# We require leap_web_core from here so we can use the path option.
+gem "leap_web_core", :path => '../core'
+
+# Declare your gem's dependencies in leap_web_users.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.
 gemspec
 
-# jquery-rails is used by the dummy application
-gem "jquery-rails"
-
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
 # To use debugger
- gem 'ruby-debug'
-
- # TODO: not sure I actually want this here, but trying:
-  gem 'therubyracer', :platforms => :ruby
+# gem 'ruby-debug'
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..09827dc 100644
--- a/help/leap_web_help.gemspec
+++ b/help/leap_web_help.gemspec
@@ -1,26 +1,19 @@
 $:.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"
- 
-  LeapWebCore::Dependencies.add_ui_gems_to_spec(s)
-  
-  # s.add_dependency "jquery-rails"
+  s.add_dependency "leap_web_core", LeapWeb::VERSION
 end
diff --git a/help/lib/leap_web_help/engine.rb b/help/lib/leap_web_help/engine.rb
index 2ff3e86..4146dfc 100644
--- a/help/lib/leap_web_help/engine.rb
+++ b/help/lib/leap_web_help/engine.rb
@@ -1,8 +1,6 @@
 # thou shall require all your dependencies in an engine.
 require "leap_web_core"
-#require "leap_web_users" #necessary? 
-
-LeapWebCore::Dependencies.require_ui_gems
+require "leap_web_core/ui_dependencies"
 
 module LeapWebHelp
   class Engine < ::Rails::Engine
diff --git a/help/lib/leap_web_help/version.rb b/help/lib/leap_web_help/version.rb
deleted file mode 100644
index 6a7c85d..0000000
--- a/help/lib/leap_web_help/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module LeapWebHelp
-  VERSION = "0.0.1"
-end
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!