katello-foreman-engine 0.0.7 → 0.0.11

data/katello-foreman-engine.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "katello-foreman-engine"
-  s.version = "0.0.7"
+  s.version = "0.0.11"
 
   s.authors = ["Katello"]
   s.date = "2013-04-19"

data/lib/katello_foreman_engine/actions/{environment_create.rb → content_view_create.rb}

@@ -12,24 +12,16 @@
 
 module KatelloForemanEngine
   module Actions
-    class EnvironmentCreate < Dynflow::Action
+    class ContentViewCreate < Dynflow::Action
 
       def self.subscribe
-        Katello::Actions::EnvironmentCreate
+        Katello::Actions::ContentViewCreate
       end
 
-      def plan(env)
-        plan_self 'org_label' => env.organization.label, 'label' => env.label, 'content_view_id' => 'env'
-      end
-
-      input_format do
-        param :org_label, String
-        param :label, String
-        param :content_view_id, String
-      end
-
-      def run
-        Bindings.environment_create(input['content_view_id'], input['org_label'], input['label'])
+      def plan(content_view)
+        if content_view.default?
+          plan_action ContentViewPublish, content_view
+        end
       end
     end
   end

data/lib/katello_foreman_engine/actions/content_view_publish.rb

@@ -20,8 +20,10 @@ module KatelloForemanEngine
       end
 
       def plan(content_view)
-        unless Bindings.environment_find(input['organization_label'], 'Library', input['label'])
-          plan_self input
+        unless Bindings.environment_find(content_view.organization.label, 'Library', content_view.label) 
+          plan_self('id' => content_view.id,
+                    'label' => content_view.label,
+                    'organization_label' => content_view.organization.label)
         end
         content_view.repos(content_view.organization.library).each do |repo|
           plan_action(RepositoryChange, repo)

data/lib/katello_foreman_engine/actions/environment_destroy.rb

@@ -14,26 +14,15 @@ module KatelloForemanEngine
   module Actions
     class EnvironmentDestroy < Dynflow::Action
 
-      input_format do
-        param :foreman_id, String
-      end
-
       def self.subscribe
         Katello::Actions::EnvironmentDestroy
       end
 
       def plan(env)
-        if foreman_env = Bindings.environment_find(env.organization.label, env.label)
-          env.content_views.each do |content_view|
-            plan_action(ContentViewDemote, content_view, env)
-          end
-          plan_self 'foreman_id' => foreman_env['environment']['id']
+        env.content_views.each do |content_view|
+          plan_action(ContentViewDemote, content_view, env)
         end
       end
-
-      def run
-        Bindings.environment_destroy(input['foreman_id'])
-      end
     end
   end
 end

data/test/lib/actions/content_view_publish_test.rb

@@ -5,24 +5,23 @@ module KatelloForemanEngine
     class ContentViewPublishTest < ActiveSupport::TestCase
 
       def setup
-        @org = Organization.new(:label => 'org')
-        @content_view = ContentView.new { |cv| cv.organization = @org }
+        @org = Organization.new(:label => 'ACME')
+        @content_view = ContentView.new(:label => 'cv', :id => '123') do |cv|
+          cv.organization = @org
+        end
         @content_view.stubs(:repos).returns([])
-
-        @input = { 'organization_label' => 'ACME',
-                   'id' => '123',
-                   'label' => 'cv' }
       end
 
       test "runs unless the environment in foreman is already created " do
         Bindings.stubs(:environment_find).with('ACME', 'Library', 'cv').returns(nil)
 
-        step = run_steps(ContentViewPublish, @input, @content_view).first
+        step = run_steps(ContentViewPublish, {}, @content_view).first
         assert_equal ContentViewPublish, step.action_class
-        assert_equal step.input, @input
+        assert_equal 'cv', step.input['label']
+        assert_equal 'ACME', step.input['organization_label']
 
         Bindings.stubs(:environment_find).with('ACME', 'Library', 'cv').returns({'id' => '123'})
-        assert_equal [], run_steps(ContentViewPublish, @input, @content_view)
+        assert_equal [], run_steps(ContentViewPublish, {}, @content_view)
       end
 
       test "plans repository change action for every repo involved" do
@@ -30,7 +29,7 @@ module KatelloForemanEngine
         repo = Repository.new
         @content_view.stubs(:repos).returns([repo])
 
-        action_class, arg = planned_actions(ContentViewPublish, @input, @content_view).first
+        action_class, arg = planned_actions(ContentViewPublish, {}, @content_view).first
         assert_equal RepositoryChange, action_class
         assert_equal arg, repo
       end

data/test/lib/actions/env_destroy_test.rb

@@ -9,30 +9,8 @@ module KatelloForemanEngine
         env = KTEnvironment.new(:label => 'dev')
         env.organization = org
 
-        foreman_env = { 'environment' => { 'id' => '123' } }
-        Bindings.expects(:environment_find).with('org', 'dev').
-            times(2).returns(foreman_env)
-
-        env.library = false
-        step = run_steps(EnvironmentDestroy,{}, env).first
-        assert_equal EnvironmentDestroy, step.action_class
-        assert_equal step.input['foreman_id'], '123'
-
-        env.library = true
-        step = run_steps(EnvironmentDestroy,{}, env).first
-        assert_equal EnvironmentDestroy, step.action_class
-        assert_equal step.input['foreman_id'], '123'
-
-        env.library = false
-        Bindings.expects(:environment_find).returns(nil)
         assert_equal [], run_steps(EnvironmentDestroy,{}, env)
       end
-
-      test 'calls bindings to destroy environment' do
-        Bindings.expects(:environment_destroy).with('123')
-        EnvironmentDestroy.new('foreman_id' => '123').run
-      end
-
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katello-foreman-engine
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -53,35 +53,34 @@ files:
 - katello-foreman-engine.gemspec
 - LICENSE
 - Rakefile
-- lib/katello_foreman_engine.rb
+- lib/katello-foreman-engine.rb
+- lib/katello_foreman_engine/engine.rb
+- lib/katello_foreman_engine/actions/environment_destroy.rb
+- lib/katello_foreman_engine/actions/distribution_unpublish.rb
 - lib/katello_foreman_engine/actions/changeset_promote.rb
-- lib/katello_foreman_engine/actions/content_view_promote.rb
-- lib/katello_foreman_engine/actions/content_view_publish.rb
-- lib/katello_foreman_engine/actions/repository_change.rb
 - lib/katello_foreman_engine/actions/content_view_demote.rb
 - lib/katello_foreman_engine/actions/user_destroy.rb
-- lib/katello_foreman_engine/actions/distribution_unpublish.rb
-- lib/katello_foreman_engine/actions/distribution_publish.rb
 - lib/katello_foreman_engine/actions/org_destroy.rb
+- lib/katello_foreman_engine/actions/content_view_create.rb
+- lib/katello_foreman_engine/actions/repository_change.rb
+- lib/katello_foreman_engine/actions/distribution_publish.rb
+- lib/katello_foreman_engine/actions/content_view_publish.rb
+- lib/katello_foreman_engine/actions/content_view_promote.rb
 - lib/katello_foreman_engine/actions/user_create.rb
 - lib/katello_foreman_engine/actions/org_create.rb
-- lib/katello_foreman_engine/actions/environment_create.rb
-- lib/katello_foreman_engine/actions/environment_destroy.rb
 - lib/katello_foreman_engine/settings.rb
-- lib/katello_foreman_engine/engine.rb
-- lib/katello_foreman_engine/helpers.rb
 - lib/katello_foreman_engine/bindings.rb
-- lib/katello-foreman-engine.rb
+- lib/katello_foreman_engine/helpers.rb
+- lib/katello_foreman_engine.rb
 - test/test_helper.rb
 - test/lib/settings_test.rb
-- test/lib/actions/env_destroy_test.rb
-- test/lib/actions/distribution_unpublish_test.rb
-- test/lib/actions/org_destroy_test.rb
-- test/lib/actions/env_create_test.rb
+- test/lib/actions/content_view_publish_test.rb
 - test/lib/actions/org_create_test.rb
+- test/lib/actions/distribution_unpublish_test.rb
 - test/lib/actions/repository_change_test.rb
+- test/lib/actions/org_destroy_test.rb
+- test/lib/actions/env_destroy_test.rb
 - test/lib/actions/distribution_publish_test.rb
-- test/lib/actions/content_view_publish_test.rb
 - test/lib/bindings_test.rb
 homepage: http://github.com/katello/katello-foreman-engine
 licenses:
@@ -104,8 +103,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Foreman specific parts of Katello
 test_files: []
+has_rdoc: 

data/test/lib/actions/env_create_test.rb

@@ -1,34 +0,0 @@
-require 'test_helper'
-
-module KatelloForemanEngine
-  module Actions
-    class EnvCreateTest < ActiveSupport::TestCase
-
-      test "runs both for library and non-library envs " do
-        org = Organization.new(:label => 'org')
-        env = KTEnvironment.new(:label => 'dev')
-        env.organization = org
-
-        env.library = false
-        step = run_steps(EnvironmentCreate, {}, env).first
-        assert_equal EnvironmentCreate, step.action_class
-        assert_equal 'org', step.input['org_label']
-        assert_equal 'dev', step.input['label']
-        assert_equal 'env', step.input['content_view_id']
-
-        env.library = true
-        step = run_steps(EnvironmentCreate, {}, env).first
-        assert_equal EnvironmentCreate, step.action_class
-        assert_equal 'org', step.input['org_label']
-        assert_equal 'dev', step.input['label']
-        assert_equal 'env', step.input['content_view_id']
-      end
-
-      test 'calls bindings to create environment' do
-        Bindings.expects(:environment_create).with('env', 'org', 'dev')
-        EnvironmentCreate.new('org_label' => 'org', 'label' => 'dev', 'content_view_id' => 'env').run
-      end
-
-    end
-  end
-end