foreman-katello-engine 0.0.3 → 0.0.4

data/.gitignore

@@ -1 +1,3 @@
 Gemfile.lock
+test/foreman_app
+.bundle

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - "1.8.7"
+  - "1.9.3"
+before_install: rake test:foreman_prepare
+script: rake test

data/Gemfile

@@ -1,3 +1,18 @@
 source "https://rubygems.org"
 
 gemspec
+
+FOREMAN_GEMFILE=File.expand_path('../test/foreman_app/Gemfile', __FILE__)
+unless File.exist?(FOREMAN_GEMFILE)
+  puts <<MESSAGE
+Foreman source code is not present. To get the latest version, run:
+
+  rake test:foreman_prepare
+
+and try again.
+MESSAGE
+
+else
+  self.instance_eval(Bundler.read_file(FOREMAN_GEMFILE))
+end
+

data/README.md

@@ -1,5 +1,6 @@
 Foreman Katello Rails Engine
 ============================
+[![Build Status](https://travis-ci.org/Katello/foreman-katello-engine.png?branch=master)](https://travis-ci.org/Katello/foreman-katello-engine)
 
 Bringing Katello specific code into Foreman.
 
@@ -9,7 +10,6 @@ Installation
 Create `bundler.d/katello.rb` in your Foreman installation:
 
 ```ruby
-gem 'deface', '~> 0.7.2'
 gem 'foreman-katello-engine'
 ```
 
@@ -72,13 +72,28 @@ and reference it from the kickstart template:
 <%= snippets "katello" %>
 ```
 
-Current status
---------------
+Testing
+-------
+
+Since this is a Rails engine, it needs a host app to test the
+functionality properly. Therefore to run the tests, you need to get
+the source for the Foreman, as well as setting the development
+environment.
+
+The easiest way to do it is running this rake task:
+
+    rake test:foreman_prepare
+
+This downloads the latest Foreman develop code, as well as installs
+required dependencies.
+
+To run the whole suite use:
+
+    rake test
 
-Highly experimental.
+To execute a single test file run:
 
-The values for activation keys are not synced from actual Katello
-instance, just some test values.
+    ruby -Itest:lib path/to/your_test.rb
 
 Licence
 -------

data/Rakefile

@@ -0,0 +1,104 @@
+ENGINE_DIR = File.expand_path('..', __FILE__)
+FOREMAN_DIR = 'test/foreman_app'
+require 'fileutils'
+
+namespace :test do
+  desc "Download latest foreman devel source and install dependencies"
+  task :foreman_prepare do
+    foreman_repo = 'https://github.com/theforeman/foreman.git'
+    foreman_gemfile = File.join(FOREMAN_DIR, "Gemfile")
+    unless File.exists?(foreman_gemfile)
+      puts "Foreman source code is not present at #{FOREMAN_DIR}"
+      puts "Downloading latest Foreman development branch into #{FOREMAN_DIR}..."
+      FileUtils.mkdir_p(FOREMAN_DIR)
+
+      unless system("git clone #{foreman_repo} #{FOREMAN_DIR}")
+        puts "Error while getting latest Foreman code from #{foreman_repo} into #{FOREMAN_DIR}"
+        fail
+      end
+    end
+
+    gemfile_content = File.read(foreman_gemfile)
+    unless gemfile_content.include?('FOREMAN_GEMFILE')
+      puts 'Preparing Gemfile'
+      gemfile_content.gsub!('__FILE__', 'FOREMAN_GEMFILE')
+      gemfile_content.insert(0, "FOREMAN_GEMFILE = __FILE__ unless defined? FOREMAN_GEMFILE\n")
+      File.open(foreman_gemfile, 'w') { |f| f << gemfile_content }
+    end
+
+    settings_file = "#{FOREMAN_DIR}/config/settings.yaml"
+    unless File.exists?(settings_file)
+      puts 'Preparing settings file'
+      FileUtils.copy("#{settings_file}.example", settings_file)
+      settings_content = File.read(settings_file)
+      settings_content.sub!('organizations_enabled: false', 'organizations_enabled: true')
+      settings_content << ":puppetgem: true\n"
+      File.open(settings_file, 'w') { |f| f << settings_content }
+    end
+
+    db_file = "#{FOREMAN_DIR}/config/database.yml"
+    unless File.exists?(db_file)
+      puts 'Preparing database file'
+      FileUtils.copy("#{db_file}.example", db_file)
+    end
+
+    ["#{ENGINE_DIR}/.bundle/config", "#{FOREMAN_DIR}/.bundle/config"].each do |bundle_file|
+      unless File.exists?(bundle_file)
+        FileUtils.mkdir_p(File.dirname(bundle_file))
+        puts 'Preparing bundler configuration'
+        File.open(bundle_file, 'w') { |f| f << <<FILE }
+---
+BUNDLE_WITHOUT: console:development:fog:jsonp:libvirt:mysql:mysql2:ovirt:postgresql:vmware
+FILE
+      end
+    end
+
+    local_gemfile = "#{FOREMAN_DIR}/bundler.d/Gemfile.local.rb"
+    unless File.exist?(local_gemfile)
+      File.open(local_gemfile, 'w') { |f| f << <<GEMFILE }
+gem "puppet"
+gem "facter"
+GEMFILE
+    end
+
+    puts 'Installing dependencies...'
+    unless system('bundle install')
+      fail
+    end
+  end
+
+  task :db_prepare do
+    unless File.exists?(FOREMAN_DIR)
+      puts <<MESSAGE
+Foreman source code not prepared. Run
+
+  rake test:foreman_prepare
+
+to download foreman source and its dependencies
+MESSAGE
+      fail
+    end
+
+    # once we are Ruby19 only, switch to block variant of cd
+    pwd = FileUtils.pwd
+    FileUtils.cd(FOREMAN_DIR)
+    unless system('rake db:test:prepare RAILS_ENV=test')
+      puts "Migrating database first"
+      system('rake db:migrate db:schema:dump db:test:prepare RAILS_ENV=test') || fail
+    end
+    FileUtils.cd(pwd)
+  end
+
+  task :set_loadpath do
+    %w[lib test].each do |dir|
+      $:.unshift(File.expand_path(dir, ENGINE_DIR))
+    end
+  end
+
+  task :all => [:db_prepare, :set_loadpath] do
+    Dir.glob('test/**/*_test.rb') { |f| require f.sub('test/','')  unless f.include? '/foreman_app/' }
+  end
+
+end
+
+task :test => 'test:all'

data/foreman-katello-engine.gemspec

@@ -1,15 +1,16 @@
 Gem::Specification.new do |s|
   s.name = "foreman-katello-engine"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.authors = ["Katello"]
   s.date = "2013-03-04"
   s.description = "Katello specific parts of Foreman"
   s.email = "katello-devel@redhat.com"
   s.files = `git ls-files`.split("\n")
-  s.homepage = "http://katello.org"
+  s.homepage = "http://github.com/katello/foreman-katello-engine"
   s.licenses = ["GPL-2"]
   s.require_paths = ["lib"]
   s.add_dependency "katello_api"
+  s.add_dependency "deface", "~> 0.7.2"
   s.summary = "Katello specific parts of Foreman"
 end

data/lib/foreman-katello-engine.rb

@@ -1 +1,2 @@
+require 'deface'
 require 'foreman_katello_engine'

data/lib/foreman_katello_engine/bindings.rb

@@ -5,14 +5,6 @@ module ForemanKatelloEngine
 
     class << self
 
-      def initialize_settings
-        # proceed only if db set up correctly
-        Setting.first rescue return
-        [
-         Foreman::DefaultSettings::Loader.set('katello_url', 'url of a Katello instance', 'https://localhost/katello')
-        ].each { |s| Foreman::DefaultSettings::Loader.create(s.update(:category => "General")) }
-      end
-
       def client_config
         {
           :base_url => Setting['katello_url'],
@@ -33,11 +25,11 @@ module ForemanKatelloEngine
       end
 
       def activation_keys_to_subscriptions(org_name, env_name)
-        environments, _ = self.environment.index('organization_id' => org_name, :name => env_name)
+        environments, _ = self.environment.index('organization_id' => org_name, 'name' => env_name)
         if environment = environments.first
           activation_keys, _ = self.activation_key.index('environment_id' => environment['id'])
           return activation_keys.reduce({}) do |h, ak|
-            h.update(ak['name'] => ak['pools'].map { |pool| pool['subscription'] })
+            h.update(ak['name'] => ak['pools'].map { |pool| pool['productName'] })
           end
         else
           return nil

data/lib/foreman_katello_engine/engine.rb

@@ -3,9 +3,13 @@ module ForemanKatelloEngine
   #Thus, inhereits from ::Rails::Engine and not from Rails::Engine
   class Engine < ::Rails::Engine
 
-    initializer 'foreman_katello_engine.helper' do |app|
+    config.after_initialize do
       require 'foreman_katello_engine/bindings'
-      ForemanKatelloEngine::Bindings.initialize_settings
+      require 'foreman_katello_engine/settings'
+      ForemanKatelloEngine::Settings.initialize_settings
+    end
+
+    initializer 'foreman_katello_engine.helper' do |app|
       ActionView::Base.send :include, ForemanKatelloEngine::HostsAndHostgroupsHelper
     end
 

data/lib/foreman_katello_engine/settings.rb

@@ -0,0 +1,13 @@
+module ForemanKatelloEngine
+  class Settings
+
+    def self.initialize_settings
+      # proceed only if db set up correctly
+      Setting.first rescue return
+      [
+       Foreman::DefaultSettings::Loader.set('katello_url', 'url of a Katello instance', 'https://localhost/katello')
+      ].each { |s| Foreman::DefaultSettings::Loader.create(s.update(:category => "General")) }
+    end
+
+  end
+end

data/test/functional/activation_keys_controller_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+require 'mocha/setup'
+
+class ActivationKeysControllerTest < ActionController::TestCase
+
+  def aks_to_subscriptions_data
+    {"ak1" => ["prod1", "prod2"], "ak2" => ["prod3", "prod4"]}
+  end
+
+  def test_index
+    ForemanKatelloEngine::Bindings.stubs(:activation_keys_to_subscriptions).returns(aks_to_subscriptions_data)
+    get :index, {}, set_session_user
+    assert_response :success
+    assert_equal aks_to_subscriptions_data, JSON.parse(response.body)
+  end
+
+end

data/test/lib/bindings_test.rb

@@ -0,0 +1,74 @@
+require 'test_helper'
+require 'mocha/setup'
+
+class BindingsTest < ActiveSupport::TestCase
+
+  def setup
+    Foreman::DefaultSettings::Loader.load
+    ForemanKatelloEngine::Settings.initialize_settings
+  end
+
+  test 'client lib setting' do
+    Setting['katello_url'] = 'https://example.com/katello'
+    Setting['oauth_consumer_key'] = 'key'
+    Setting['oauth_consumer_secret'] = 'secret'
+    config = ForemanKatelloEngine::Bindings.environment.config
+    assert_equal 'https://example.com/katello', config[:base_url]
+    assert_equal 'key', config[:oauth][:consumer_key]
+    assert_equal 'secret', config[:oauth][:consumer_secret]
+  end
+
+  test 'activation keys to subscriptions mapping' do
+    KatelloApi::Resources::Environment.any_instance.
+      expects(:index).
+      with('organization_id' => 'ACME_Corporation', 'name' => 'Dev').
+      returns([environments_data, environments_data.to_json])
+
+    KatelloApi::Resources::ActivationKey.any_instance.
+      expects(:index).
+      with('environment_id' => 2).
+      returns([activation_keys_data, activation_keys_data.to_json])
+
+    expected_mapping = {"katello-and-friends-dev" => ["Katello", "Candlepin", "Pulp", "Foreman"]}
+    mapping = ForemanKatelloEngine::Bindings.activation_keys_to_subscriptions('ACME_Corporation', 'Dev')
+    assert_equal(expected_mapping, mapping)
+  end
+
+  def environments_data
+    [
+     {"updated_at"=>"2013-03-08T13:26:56Z",
+       "created_at"=>"2013-03-08T13:26:56Z",
+       "name"=>"Dev",
+       "prior"=>"Library",
+       "prior_id"=>1,
+       "library"=>false,
+       "organization_id"=>1,
+       "description"=>"",
+       "id"=>2,
+       "organization"=>"ACME_Corporation",
+       "label"=>"Dev"},
+    ]
+  end
+
+  def activation_keys_data
+    [
+     {"name"=>"katello-and-friends-dev",
+       "description"=>"",
+       "user_id"=>1,
+       "created_at"=>"2013-03-08T14:23:06Z",
+       "system_template_id"=>nil,
+       "updated_at"=>"2013-03-13T13:59:38Z",
+       "id"=>1,
+       "organization_id"=>1,
+       "usage_limit"=>-1,
+       "pools"=>
+       [{"cp_id" => "8a90c4ae3d49de9b013d5dab8019004a", "productName" => "Katello"},
+        {"cp_id" => "8a90c4ae3d49de9b013d5dabc862004d", "productName" => "Candlepin"},
+        {"cp_id" => "8a90c4ae3d49de9b013d62d38e340071", "productName" => "Pulp"},
+        {"cp_id" => "8a90c4ae3d49de9b013d62d163e9006d", "productName" => "Foreman"}],
+       "content_view_id"=>nil,
+       "environment_id"=>2,
+       "usage_count"=>2},
+    ]
+  end
+end

data/test/lib/settings_test.rb

@@ -0,0 +1,13 @@
+require 'test_helper'
+
+class SettingsTest < ActiveSupport::TestCase
+
+  def setup
+    #Setting.where(:name => 'katello_url').delete_all
+  end
+
+  test "katello specific settings" do
+    ForemanKatelloEngine::Settings.initialize_settings
+    assert_equal 'https://localhost/katello', Setting['katello_url']
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,28 @@
+require 'rubygems'
+require 'bundler/setup'
+
+ENV["RAILS_ENV"] ||= 'test'
+require File.join("foreman_app/config/environment.rb")
+
+require 'test/unit'
+require 'foreman-katello-engine'
+require 'rails/test_help'
+
+Rails.backtrace_cleaner.remove_silencers!
+
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
+  #
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherit this setting
+
+  foreman_dir =  File.expand_path("../foreman_app", File.join(Dir.pwd, __FILE__))
+  fixture_path=File.join(foreman_dir, "test/fixtures")
+  fixtures :all
+
+  set_fixture_class({ :hosts => Host::Base })
+end
+
+def set_session_user
+  SETTINGS[:login] ? {:user => User.admin.id, :expires_at => 5.minutes.from_now} : {}
+end

metadata

@@ -1,49 +1,60 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: foreman-katello-engine
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Katello
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: katello_api
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: deface
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.2
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.2
 description: Katello specific parts of Foreman
 email: katello-devel@redhat.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - app/controllers/activation_keys_controller.rb
 - app/helpers/foreman_katello_engine/hosts_and_hostgroups_helper.rb
 - app/models/activation_key.rb
@@ -56,38 +67,34 @@ files:
 - lib/foreman_katello_engine.rb
 - lib/foreman_katello_engine/bindings.rb
 - lib/foreman_katello_engine/engine.rb
-homepage: http://katello.org
-licenses: 
+- lib/foreman_katello_engine/settings.rb
+- test/functional/activation_keys_controller_test.rb
+- test/lib/bindings_test.rb
+- test/lib/settings_test.rb
+- test/test_helper.rb
+homepage: http://github.com/katello/foreman-katello-engine
+licenses:
 - GPL-2
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Katello specific parts of Foreman
 test_files: []
-