foreman_content 0.3 → 0.4

data/app/views/content/repositories/_fields.html.erb

@@ -0,0 +1,9 @@
+<%= text_f f, :name %>
+<%= text_f f, :feed, :class => 'span6' %>
+<%= selectable_f f, :content_type, @repository.content_types %>
+<%= select_f f, :architecture_id, ::Architecture.all, :id, :name, { :include_blank => N_("noarch")} %>
+<%= checkbox_f f, :enabled %>
+<%= checkbox_f f, :publish, { :disabled => !f.object.new_record?,
+                              :help_inline => _('should this repository be directly accessible or as a feed for content views?') } %>
+<%= select_f f, :gpg_key_id, Content::GpgKey.all, :id, :name, {:include_blank => true}, {:label => _("GPG Key")} %>
+<%= f.hidden_field :type if f.object.new_record? %>

data/app/views/content/repositories/_os_form.html.erb

@@ -1,21 +1,16 @@
-<%= javascript 'content/content.js' %>
 <%= form_for @repository, :url => (@repository.new_record? ? repositories_path : repository_path(:id => @repository.id)) do |f| %>
   <%= base_errors_for @repository %>
   <ul class="nav nav-tabs" data-tabs="tabs">
     <li class="active"><a href="#primary" data-toggle="tab"><%= _("Repository") %></a></li>
+    <li><a href="#sync_schedule" data-toggle="tab"><%= _("Sync Schedule") %></a></li>
   </ul>
   <div class="tab-content">
     <div class="tab-pane active" id="primary">
-      <%= f.hidden_field :type %>
-      <%= select_f f, :operatingsystem_id, ::Redhat.all, :id, :to_label, {}, {:label => _("Operating System")} %>
-      <%= text_f f, :name %>
-      <%= text_f f, :feed, :class => 'span6' %>
-      <%= selectable_f f, :content_type, @repository.content_types %>
-      <%= select_f f, :architecture_id, ::Architecture.all, :id, :name, { :include_blank => N_("noarch")} %>
-      <%= checkbox_f f, :enabled %>
-
-      <%= select_f f, :gpg_key_id, Content::GpgKey.all, :id, :name, {:include_blank => true}, {:label => _("GPG Key")} %>
-
+      <%= select_f f, :originator_id, ::Redhat.all, :id, :to_label, {}, {:label => _("Operating System")} %>
+      <%= render :partial => 'fields', :locals => {:f => f} %>
+    </div>
+    <div class="tab-pane" id="sync_schedule">
+      <%= render :partial => 'sync_schedule', :locals => { :f => f } %>
     </div>
   </div>
   <%= submit_or_cancel f %>

data/app/views/content/repositories/_product_form.html.erb

@@ -1,28 +1,24 @@
-<%= javascript 'content/content.js' %>
 <%= form_for @repository, :url => (@repository.new_record? ? repositories_path : repository_path(:id => @repository.id)) do |f| %>
   <%= base_errors_for @repository %>
   <ul class="nav nav-tabs" data-tabs="tabs">
     <li class="active"><a href="#primary" data-toggle="tab"><%= _("Repository") %></a></li>
     <li><a href="#operatingsystems" data-toggle="tab"><%= _("Operating systems") %></a></li>
+    <li><a href="#sync_schedule" data-toggle="tab"><%= _("Sync Schedule") %></a></li>
   </ul>
   <div class="tab-content">
     <div class="tab-pane active" id="primary">
-      <%= f.hidden_field :type %>
-      <%= select_f f, :product_id, Content::Product.all, :id, :name, {}, {:label => _("Product")} %>
-      <%= text_f f, :name %>
-      <%= text_f f, :feed, :class => 'span6' %>
-      <%= selectable_f f, :content_type, @repository.content_types %>
-      <%= select_f f, :architecture_id, ::Architecture.all, :id, :name, { :include_blank => N_("noarch")} %>
-      <%= checkbox_f f, :enabled %>
-
-      <%= select_f f, :gpg_key_id, Content::GpgKey.all, :id, :name, {:include_blank => true}, {:label => _("GPG Key")} %>
-
+      <%= select_f f, :originator_id, Content::Product.all, :id, :name, { :prompt => _('Please Select') }, { :label => _("Product") } %>
+      <%= render :partial => 'fields', :locals => { :f => f } %>
     </div>
     <div class="tab-pane" id="operatingsystems">
       <%= alert :class => 'controls alert-success', :header => 'Repository for operating systems',
                 :text  => _('This Repository will be restricted only to hosts that runs the selected operating system') %>
       <%= multiple_selects(f, :operatingsystems, ::Redhat, @repository.operatingsystem_ids) %>
     </div>
+    <div class="tab-pane" id="sync_schedule">
+      <%= render :partial => 'sync_schedule', :locals => { :f => f } %>
+    </div>
+
   </div>
   <%= submit_or_cancel f %>
 <% end %>

data/app/views/content/repositories/_repository.html.erb

@@ -0,0 +1,4 @@
+<td><%= link_to_if_authorized(h(repository.name), hash_for_repository_path(repository)) %></td>
+<td><%= repository.try(:state) %></td>
+<td><%= last_time(repository.kind_of?(Content::Repository) ? repository.last_sync : repository.last_published) %></td>
+<td><%= repository.content_type %></td>

data/app/views/content/repositories/_sync_schedule.erb

@@ -0,0 +1,10 @@
+<%= checkbox_f f, :schedule, :label => _('Schedule Sync'),
+    :help_inline => _('Sync this repository periodically') %>
+
+<div class='control-group'>
+<div class='controls'>
+
+  <%= sync_schedule_selector(f) %>
+</div>
+</div>
+

data/app/views/content/repositories/edit.html.erb

@@ -1,3 +1,5 @@
+<%= javascript 'content/repository.js' %>
+
 <% title _("Edit Repository") %>
 <% if @repository.is_a? Content::Repository::OperatingSystem %>
   <%= render :partial => 'os_form' %>

data/app/views/content/repositories/index.html.erb

@@ -7,28 +7,26 @@
 <table class="table table-bordered table-striped">
   <tr>
     <th><%= sort :name, :as => s_("Name") %></th>
-    <th><%= _("Product") %></th>
     <th><%= _("State") %></th>
     <th><%= _("Last sync status") %></th>
     <th><%= _("Content type") %></th>
     <th></th>
   </tr>
-  <% @repositories.each do |repository| %>
-    <tr>
-      <td><%= link_to_if_authorized(h(repository.name), hash_for_repository_path(repository)) %></td>
-      <td><%= repository.entity_name %></td>
-      <td><%= repository.try(:state) %></td>
-      <td><%= last_time(repository.last_sync) %></td>
-      <td><%= repository.content_type %></td>
-      <td align="right">
-        <%= action_buttons(
-                display_link_if_authorized(_("Edit"), hash_for_edit_repository_path(repository)),
-                display_link_if_authorized(_("Synchronize"), hash_for_sync_repository_path(repository), :method => :put),
-                display_delete_if_authorized(hash_for_repository_path(repository), :confirm => "Delete #{repository.name}?")
-            ) %>
+  <% @repositories.group_by(&:originator).each do |originator, repositories| %>
+    <tr><td colspan = '5'><%= originator %></td></tr>
+    <% repositories.each do |repository| %>
+      <tr>
+        <%= render :partial => 'repository', :locals => { :repository => repository } %>
+        <td align="right">
+          <%= action_buttons(
+                  display_link_if_authorized(_("Edit"), hash_for_edit_repository_path(repository)),
+                  display_link_if_authorized(_("Synchronize"), hash_for_sync_repository_path(repository), :method => :put),
+                  display_delete_if_authorized(hash_for_repository_path(repository), :confirm => "Delete #{repository.name}?")
+              ) %>
 
-      </td>
-    </tr>
+        </td>
+      </tr>
+    <% end %>
   <% end %>
 </table>
 <%= page_entries_info @repositories %>

data/app/views/content/repositories/new.html.erb

@@ -1,3 +1,5 @@
+<%= javascript 'content/repository.js' %>
+
 <% title _("New Repository") %>
 <% if @repository.is_a? Content::Repository::OperatingSystem %>
   <%= render :partial => "os_form" %>

data/app/views/content/repositories/show.html.erb

@@ -41,51 +41,65 @@
         <td> <%= _("Unprotected") %> </td>
         <td> <%= @repository.unprotected %> </td>
       </tr>
+      <% if @repository.publish %>
+        <tr>
+          <td> <%= _("URL") %> </td>
+          <td> <%= @repository.full_path %> </td>
+        </tr>
+      <% end %>
+      <tr>
+        <td> <%= _('Sync Schedule') %> </td>
+        <td> <%= sync_schedule(@repository.sync_schedule) %> </td>
+      </tr>
+
     </table>
   </div>
 </div>
 <div class="row-fluid">
-  <div class="stats-well span4">
-    <h4 class="ca" ><%= _('Last Update Metrics') -%></h4>
-    <div style="margin-top:50px;padding-bottom: 40px;">
-      <%= flot_pie_chart("metrics" ,_("Last Update Metrics"), @repository.sync_history.last.try(:times), :class => "statistics-pie small")%>
+  <%# running sync %>
+  <% if @repository.sync_history.any? %>
+    <div class="stats-well span4">
+      <h4 class="ca" ><%= _('Last Update Metrics') -%></h4>
+      <div style="margin-top:50px;padding-bottom: 40px;">
+        <%= flot_pie_chart("metrics" ,_("Last Update Metrics"), @repository.sync_history.last.try(:times), :class => "statistics-pie small") %>
+      </div>
+    </div>
+    <div class="stats-well span4">
+      <h4 class="ca" ><%= _('Update Summary') -%></h4>
+      <%= flot_bar_chart("status" ,"", _("Number of packages"), @repository.sync_history.last.try(:metrics), :class => "statistics-bar")%>
     </div>
-  </div>
-  <div class="stats-well span4">
-    <h4 class="ca" ><%= _('Update Summary') -%></h4>
-    <%= flot_bar_chart("status" ,"", _("Number of packages"), @repository.sync_history.last.try(:metrics), :class => "statistics-bar")%>
-  </div>
 
-  <div class="span4">
-    <table class="table table-bordered table-striped">
-      <tr>
-        <th><%= _('Repository Counters') %></th>
-        <th></th>
-      </tr>
-      <% @repository.counters.each do |name, value| -%>
+    <div class="span4">
+      <table class="table table-bordered table-striped">
         <tr>
-          <td> <%= name.to_s.humanize %> </td>
-          <td> <%= value %> </td>
+          <th><%= _('Repository Counters') %></th>
+          <th></th>
         </tr>
-      <% end -%>
-      <tr>
-        <td> <%= _("Last synchronized") %> </td>
-        <td> <%= last_time @repository.last_sync %> </td>
-      </tr>
-    </table>
-  </div>
-  <div class="span4">
-    <table class="table table-bordered table-striped">
-      <tr>
-        <th><%= _('Last Sync') %></th>
-        <th></th>
-      </tr>
-      <% @repository.sync_history.last.status.each do |name, value| -%>
+        <% @repository.counters.each do |name, value| -%>
+          <tr>
+            <td> <%= name.to_s.humanize %> </td>
+            <td> <%= value %> </td>
+          </tr>
+        <% end -%>
         <tr>
-          <td> <%= name.to_s.humanize %> </td>
-          <td> <%= value %> </td>
+          <td> <%= _("Last synchronized") %> </td>
+          <td> <%= last_time @repository.last_sync %> </td>
         </tr>
-      <% end -%>
-    </table>
-  </div>
+      </table>
+    </div>
+    <div class="span4">
+      <table class="table table-bordered table-striped">
+        <tr>
+          <th><%= _('Last Sync') %></th>
+          <th></th>
+        </tr>
+        <% @repository.sync_history.last.status.each do |name, value| -%>
+          <tr>
+            <td> <%= name.to_s.humanize %> </td>
+            <td> <%= value %> </td>
+          </tr>
+        <% end -%>
+      </table>
+    </div>
+  <% end %>
 </div>

data/db/migrate/20130807121629_create_content_content_views.rb

@@ -9,7 +9,7 @@ class CreateContentContentViews < ActiveRecord::Migration
       t.timestamps
     end
     add_index(:content_content_views, :ancestry,:name=>'content_view_ancestry_index')
-    add_index :content_content_views, [:originator_id, :originator_type]
+    add_index :content_content_views, [:originator_id, :originator_type], :name => 'content_view_id_type_index'
     add_index :content_content_views, :originator_type
   end
 end

data/db/migrate/20130828173006_change_content_view_index_name.rb

@@ -0,0 +1,10 @@
+class ChangeContentViewIndexName < ActiveRecord::Migration
+  OLD_NAME = :index_content_content_views_on_originator_id_and_originator_type
+  def up
+    rename_index :content_content_views, OLD_NAME, :content_view_id_type_index if index_name_exists? :content_content_views, OLD_NAME, nil
+  end
+
+  def down
+    rename_index :content_content_views, :content_view_id_type_index, OLD_NAME
+  end
+end

data/db/migrate/20130901070945_add_publish_boolean_to_content_repository.rb

@@ -0,0 +1,6 @@
+class AddPublishBooleanToContentRepository < ActiveRecord::Migration
+  def change
+    add_column :content_repositories, :publish, :boolean
+    add_index :content_repositories, :publish, :name => :content_repo_publish_index
+  end
+end

data/db/migrate/20130902130445_change_repository_to_polymorphic.rb

@@ -0,0 +1,42 @@
+class ChangeRepositoryToPolymorphic < ActiveRecord::Migration
+  def up
+    add_column :content_repositories, :originator_type, :string
+    add_column :content_repositories, :originator_id, :integer
+    Content::Repository.reset_column_information
+
+    Content::Repository.all.each do |repo|
+      if repo.operatingsystem_id
+        repo.originator_type = 'Operatingsystem'
+        repo.originator_id   = repo.operatingsystem_id
+      elsif repo.product_id
+        repo.originator_type = 'Content::Product'
+        repo.originator_id   = repo.product_id
+      else
+        raise "invalid repo type, can't continue: #{repo.inspect}"
+      end
+      repo.save(:validate => false)
+    end
+    remove_column :content_repositories, :operatingsystem_id
+    remove_column :content_repositories, :product_id
+  end
+
+  def down
+    add_column :content_repositories, :product_id, :integer
+    add_column :content_repositories, :operatingsystem_id, :integer
+    Content::Repository.reset_column_information
+
+    Content::Repository.all.each do |repo|
+      if repo.originator_type && repo.originator_id
+        case repo.originator_type
+          when 'Operatingsystem'
+            repo.operatingsystem_id = repo.originator_id
+          when 'Content::Product'
+            repo.product_id = repo.originator_id
+        end
+        repo.save(:validate => false)
+      end
+    end
+    remove_column :content_repositories, :originator_type
+    remove_column :content_repositories, :originator_id
+  end
+end

data/db/migrate/20130902142326_add_polymorphic_repo_to_content_view_repository_clone.rb

@@ -0,0 +1,8 @@
+class AddPolymorphicRepoToContentViewRepositoryClone < ActiveRecord::Migration
+  def change
+    add_column :content_content_view_repository_clones, :repository_type, :string
+    Content::ContentViewRepositoryClone.reset_column_information
+    Content::ContentViewRepositoryClone.update_all(:repository_type => 'Content::RepositoryClone')
+    rename_column :content_content_view_repository_clones, :repository_clone_id, :repository_id
+  end
+end

data/lib/content/version.rb

@@ -1,3 +1,3 @@
 module Content
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_content
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Dmitri Dolguikh
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -26,20 +26,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.8
-- !ruby/object:Gem::Dependency
-  name: logging
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: runcible
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +86,7 @@ files:
 - app/models/concerns/content/taxonomy_extensions.rb
 - app/models/concerns/content/hostgroup_extensions.rb
 - app/models/concerns/content/environment_extensions.rb
+- app/models/concerns/content/repository_common.rb
 - app/models/concerns/content/operatingsystem_extensions.rb
 - app/models/concerns/content/orchestration/pulp/clone.rb
 - app/models/concerns/content/orchestration/pulp/sync.rb
@@ -125,18 +112,22 @@ files:
 - app/views/content/gpg_keys/new.html.erb
 - app/views/content/gpg_keys/index.html.erb
 - app/views/content/gpg_keys/edit.html.erb
+- app/views/content/repositories/_sync_schedule.erb
 - app/views/content/repositories/new.html.erb
 - app/views/content/repositories/show.html.erb
+- app/views/content/repositories/_repository.html.erb
 - app/views/content/repositories/_product_form.html.erb
 - app/views/content/repositories/_os_form.html.erb
 - app/views/content/repositories/index.html.erb
 - app/views/content/repositories/welcome.html.erb
+- app/views/content/repositories/_fields.html.erb
 - app/views/content/repositories/edit.html.erb
 - app/views/content/content_views/_form.html.erb
+- app/views/content/content_views/_composite.html.erb
 - app/views/content/content_views/new.html.erb
 - app/views/content/content_views/_step1.html.erb
+- app/views/content/content_views/show.erb
 - app/views/content/content_views/_form_tab.html.erb
-- app/views/content/content_views/_step2.html.erb
 - app/views/content/content_views/index.html.erb
 - app/views/content/content_views/_host_tab_pane.html.erb
 - app/views/content/content_views/edit.html.erb
@@ -151,21 +142,26 @@ files:
 - app/helpers/content/content_views_helper.rb
 - app/helpers/content/repositories_helper.rb
 - app/helpers/content/application_helper.rb
+- app/assets/javascripts/content/repository.js
 - app/assets/javascripts/content/content.js
 - app/assets/stylesheets/content/application.css
 - config/environment.rb
 - config/routes.rb
 - db/migrate/20130807121629_create_content_content_views.rb
+- db/migrate/20130902130445_change_repository_to_polymorphic.rb
 - db/migrate/20130702162629_create_content_products.rb
+- db/migrate/20130901070945_add_publish_boolean_to_content_repository.rb
 - db/migrate/20130709001120_create_content_gpg_keys.rb
 - db/migrate/20130722084911_create_content_operatingsystem_repositories.rb
 - db/migrate/20130723124911_create_content_host_products.rb
 - db/migrate/20130702140034_create_content_repositories.rb
+- db/migrate/20130828173006_change_content_view_index_name.rb
 - db/migrate/20130807123220_create_content_available_content_views.rb
 - db/migrate/20130813110455_create_content_repository_clones.rb
 - db/migrate/20130723084911_create_content_hostgroup_products.rb
 - db/migrate/20130812154754_create_content_content_view_hosts.rb
 - db/migrate/20130825145431_create_content_content_view_repository_clones.rb
+- db/migrate/20130902142326_add_polymorphic_repo_to_content_view_repository_clone.rb
 - lib/content/engine.rb
 - lib/content/version.rb
 - lib/foreman_content.rb
@@ -203,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Add Foreman support for content management.