foreman_packages 0.0.18 → 0.0.19

data/app/controllers/foreman_packages/packages_controller.rb

@@ -1,55 +1,55 @@
-module ForemanPackages
-  class PackagesController < ApplicationController
+
+  class ForemanPackages::PackagesController < ApplicationController
     # GET /packages
     # GET /packages.json
     def index
-      @packages = ForemanPackages::Package.all.paginate(:page => params[:page])
+      @foreman_packages_packages = ForemanPackages::Package.all.paginate(:page => params[:page])
 
       respond_to do |format|
         format.html # index.html.erb
-        format.json { render json: @packages }
+        format.json { render json: @foreman_packages_packages }
       end
     end
 
     # GET /packages/1
     # GET /packages/1.json
     def show
-      @package = ForemanPackages::Package.find(params[:id])
+      @foreman_packages_package = ForemanPackages::Package.find(params[:id])
 
       respond_to do |format|
         format.html # show.html.erb
-        format.json { render json: @package }
+        format.json { render json: @foreman_packages_package }
       end
     end
 
     # GET /packages/new
     # GET /packages/new.json
     def new
-      @package = ForemanPackages::Package.new
+      @foreman_packages_package = ForemanPackages::Package.new
 
       respond_to do |format|
         format.html # new.html.erb
-        format.json { render json: @package }
+        format.json { render json: @foreman_packages_package }
       end
     end
 
     # GET /packages/1/edit
     def edit
-      @package = ForemanPackages::Package.find(params[:id])
+      @foreman_packages_package = ForemanPackages::Package.find(params[:id])
     end
 
     # POST /packages
     # POST /packages.json
     def create
-      @package = ForemanPackages::Package.new(params[:package])
-      @package.filename = params[:package][:filename].original_filename
+      @foreman_packages_package = ForemanPackages::Package.new(params[:foreman_packages_package])
+      @foreman_packages_package.filename = params[:foreman_packages_package][:filename].original_filename
       respond_to do |format|
-        if @package.save
-          format.html { redirect_to @package, notice: 'package was successfully created.' }
-          format.json { render json: @package, status: :created, location: @package }
+        if @foreman_packages_package.save
+          format.html { redirect_to @foreman_packages_package, notice: 'foreman_packages_package was successfully created.' }
+          format.json { render json: @foreman_packages_package, status: :created, location: @foreman_packages_package }
         else
           format.html { render action: "new" }
-          format.json { render json: @package.errors, status: :unprocessable_entity }
+          format.json { render json: @foreman_packages_package.errors, status: :unprocessable_entity }
         end
       end
     end
@@ -57,15 +57,15 @@ module ForemanPackages
     # PUT /packages/1
     # PUT /packages/1.json
     def update
-      @package = ForemanPackages::Package.find(params[:id])
-      @package.filename = params[:package][:filename].original_filename
+      @foreman_packages_package = ForemanPackages::Package.find(params[:id])
+      @foreman_packages_package.filename = params[:foreman_packages_package][:filename].original_filename
       respond_to do |format|
-        if @package.update_attributes(params[:package])
-          format.html { redirect_to @package, notice: 'package was successfully updated.' }
+        if @foreman_packages_package.update_attributes(params[:foreman_packages_package])
+          format.html { redirect_to @foreman_packages_package, notice: 'foreman_packages_package was successfully updated.' }
           format.json { head :no_content }
         else
           format.html { render action: "edit" }
-          format.json { render json: @package.errors, status: :unprocessable_entity }
+          format.json { render json: @foreman_packages_package.errors, status: :unprocessable_entity }
         end
       end
     end
@@ -73,8 +73,8 @@ module ForemanPackages
     # DELETE /packages/1
     # DELETE /packages/1.json
     def destroy
-      @package = ForemanPackages::Package.find(params[:id])
-      @package.destroy
+      @foreman_packages_package = ForemanPackages::Package.find(params[:id])
+      @foreman_packages_package.destroy
 
       respond_to do |format|
         format.html { redirect_to packages_url }
@@ -82,4 +82,4 @@ module ForemanPackages
       end
     end
   end
-end
+

data/app/uploaders/attachment_uploader.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
-module ForemanPackages
-  class AttachmentUploader < CarrierWave::Uploader::Base
+
+  class ForemanPackages::AttachmentUploader < CarrierWave::Uploader::Base
     storage :file
 
     def store_dir
@@ -13,4 +13,3 @@ module ForemanPackages
     #     "#{model.uploader_secure_token}.#{file.extension.downcase}"
     # end
   end
-end

data/app/views/foreman_packages/packages/_form.html.erb

@@ -1,7 +1,7 @@
-<%= javascript 'packages', 'package_edit', 'package_edit_interfaces', 'class_edit', 'compute_resource', 'lookup_keys'%>
+<%= javascript 'foreman_packages_packages', 'foreman_packages_package_edit', 'foreman_packages_package_edit_interfaces', 'class_edit', 'compute_resource', 'lookup_keys'%>
 
-  <%= form_for @package,  :html => {:data => {:id => @package.try(:id), :submit => 'progress_bar'}} do |f| %>
-    <%= base_errors_for @package %>
+  <%= form_for @foreman_packages_package,  :html => {:data => {:id => @foreman_packages_package.try(:id), :submit => 'progress_bar'}} do |f| %>
+    <%= base_errors_for @foreman_packages_package %>
     <div class="row clearfix">
         <div class="row">
           <div class="form-group col-md-6">

data/app/views/foreman_packages/packages/_list.html.erb

@@ -23,28 +23,28 @@
     </tr>
   </thead>
   <tbody>
-    <% packages.each do |package| %>
+    <% foreman_packages_packages.each do |foreman_packages_package| %>
       <tr>
-        <td class=''><%= package.packagename %></td>
-        <td class="hidden-xs"><%=  package.ensure %></td>
-        <td class="hidden-xs"><%=  package.file_path %></td>
-        <td class="hidden-tablet hidden-xs"><%=  package.file_ensure %></td>
-        <td class="hidden-tablet hidden-xs"><%=  package.file_source %></td>
-        <td class="hidden-tablet hidden-xs"><%=  package.file_mode %></td>
-        <td class="hidden-tablet hidden-xs"><%=  package.file_onwer %></td>
-        <td class="hidden-tablet hidden-xs"><%=  package.file_group %></td>
-        <td class="hidden-tablet hidden-xs"><%=  package.file_notify %></td>
-        <td class="hidden-tablet hidden-xs"><%=  package.file_require %></td>
+        <td class=''><%= foreman_packages_package.foreman_packages_packagename %></td>
+        <td class="hidden-xs"><%=  foreman_packages_package.ensure %></td>
+        <td class="hidden-xs"><%=  foreman_packages_package.file_path %></td>
+        <td class="hidden-tablet hidden-xs"><%=  foreman_packages_package.file_ensure %></td>
+        <td class="hidden-tablet hidden-xs"><%=  foreman_packages_package.file_source %></td>
+        <td class="hidden-tablet hidden-xs"><%=  foreman_packages_package.file_mode %></td>
+        <td class="hidden-tablet hidden-xs"><%=  foreman_packages_package.file_onwer %></td>
+        <td class="hidden-tablet hidden-xs"><%=  foreman_packages_package.file_group %></td>
+        <td class="hidden-tablet hidden-xs"><%=  foreman_packages_package.file_notify %></td>
+        <td class="hidden-tablet hidden-xs"><%=  foreman_packages_package.file_require %></td>
 
-        <td class="hidden-tablet hidden-xs"><%=  package.service_name %></td>
-        <td class="hidden-tablet hidden-xs"><%=  package.service_ensure %></td>
-        <td class="hidden-tablet hidden-xs"><%=  package.service_enable %></td>
-        <td class="hidden-tablet hidden-xs"><%=  package.service_hasstatus %></td>
-        <td class="hidden-tablet hidden-xs"><%=  package.service_hasrestart %></td>
+        <td class="hidden-tablet hidden-xs"><%=  foreman_packages_package.service_name %></td>
+        <td class="hidden-tablet hidden-xs"><%=  foreman_packages_package.service_ensure %></td>
+        <td class="hidden-tablet hidden-xs"><%=  foreman_packages_package.service_enable %></td>
+        <td class="hidden-tablet hidden-xs"><%=  foreman_packages_package.service_hasstatus %></td>
+        <td class="hidden-tablet hidden-xs"><%=  foreman_packages_package.service_hasrestart %></td>
         <td>
-          <%= link_to '查看', package %>
-          <%= link_to '编辑', edit_package_path(package) %>
-          <%= link_to '删除', package, method: :delete, data: { confirm: 'Are you sure?' } %>
+          <%= link_to '查看', foreman_packages_package %>
+          <%= link_to '编辑', edit_foreman_packages_package_path(foreman_packages_package) %>
+          <%= link_to '删除', foreman_packages_package, method: :delete, data: { confirm: 'Are you sure?' } %>
         </td>
       </tr>
     <% end %>
@@ -66,4 +66,4 @@
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
-<%= will_paginate_with_info packages, :more => " - "+_("<b class='select_count'>0</b> selected") %>
+<%= will_paginate_with_info foreman_packages_packages, :more => " - "+_("<b class='select_count'>0</b> selected") %>

data/app/views/foreman_packages/packages/index.html.erb

@@ -1,5 +1,5 @@
 <% if authorized? %>
-  <% title_actions  button_group(link_to "新增", new_package_path) %>
+  <% title_actions  button_group(link_to "新增", new_foreman_packages_package_path) %>
 <% end %>
 
-<%= render 'list', :packages => @packages, :header => @title || _("Package")  %>
+<%= render 'list', :foreman_packages_packages => @foreman_packages_packages, :header => @title || _("foreman_packages_package")  %>

data/app/views/foreman_packages/packages/show.html.erb

@@ -2,9 +2,9 @@
 <div class="container">
 	<div class="row">
 		<h1 class="clearfix">
-			<%#= @package.name %>
-			<%= link_to '返回', packages_path, class: "btn btn-primary pull-right mr1" %>
-			<%= link_to '编辑', edit_package_path(@package), class: "btn btn-warning pull-right mr1" %>
+			<%#= @foreman_packages_package.name %>
+			<%= link_to '返回', foreman_packages_packages_path, class: "btn btn-primary pull-right mr1" %>
+			<%= link_to '编辑', edit_foreman_packages_package_path(@foreman_packages_package), class: "btn btn-warning pull-right mr1" %>
 		</h1>
 	</div>
 
@@ -19,10 +19,10 @@
 					<td><strong>file_ensure</strong></td>
 				</tr>
 				<tr>
-					<td><%= @package.packagename %></td>
-					<td><%= @package.ensure %></td>
-					<td><%= @package.file_path %></td>
-					<td><%= @package.file_ensure %></td>
+					<td><%= @foreman_packages_package.packagename %></td>
+					<td><%= @foreman_packages_package.ensure %></td>
+					<td><%= @foreman_packages_package.file_path %></td>
+					<td><%= @foreman_packages_package.file_ensure %></td>
 				</tr>
 
 				<tr>
@@ -32,10 +32,10 @@
 					<td><strong>file_group</strong></td>
 				</tr>
 				<tr>
-					<td><%= @package.file_source %></td>
-					<td><%= @package.file_mode %></td>
-					<td><%= @package.file_onwer %></td>
-					<td><%= @package.file_group %></td>
+					<td><%= @foreman_packages_package.file_source %></td>
+					<td><%= @foreman_packages_package.file_mode %></td>
+					<td><%= @foreman_packages_package.file_onwer %></td>
+					<td><%= @foreman_packages_package.file_group %></td>
 				</tr>
 
 				<tr>
@@ -45,10 +45,10 @@
 					<td><strong>service_ensure</strong></td>
 				</tr>
 				<tr>
-					<td><%= @package.file_notify %></td>
-					<td><%= @package.file_require %></td>
-					<td><%= @package.service_name %></td>
-					<td><%= @package.service_ensure %></td>
+					<td><%= @foreman_packages_package.file_notify %></td>
+					<td><%= @foreman_packages_package.file_require %></td>
+					<td><%= @foreman_packages_package.service_name %></td>
+					<td><%= @foreman_packages_package.service_ensure %></td>
 				</tr>
 
 				<tr>
@@ -58,10 +58,10 @@
 					<td><strong>created_at</strong></td>
 				</tr>
 				<tr>
-					<td><%= @package.service_enable %></td>
-					<td><%= @package.service_hasstatus %></td>
-					<td><%= @package.service_hasrestart %></td>
-					<td><%= @package.created_at %></td>
+					<td><%= @foreman_packages_package.service_enable %></td>
+					<td><%= @foreman_packages_package.service_hasstatus %></td>
+					<td><%= @foreman_packages_package.service_hasrestart %></td>
+					<td><%= @foreman_packages_package.created_at %></td>
 				</tr>
 			</tbody>
 		</table>
@@ -70,7 +70,7 @@
 		<table class="table table-striped table-bordered">
 			<thead></thead>
 			<tbody>
-				<%= @package.filename %>
+				<%= @foreman_packages_package.filename %>
 			</tbody>
 			</table>
 	</div>

data/app/views/foreman_packages/packages/upload.html.erb

@@ -1,4 +1,4 @@
-<%= form_for :package, :html =>{:multipart => true} do |f| %>
+<%= form_for :foreman_packages_package, :html =>{:multipart => true} do |f| %>
   <%= f.file_field :filename %>
   <%= f.submit "Upload" %>
 <% end %>

data/lib/foreman_packages/version.rb

@@ -1,3 +1,3 @@
 module ForemanPackages
-  VERSION = '0.0.18'
+  VERSION = '0.0.19'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_packages
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors: