From 7be6b39cefa27cb0e712c927b9c2bb5135bdaef0 Mon Sep 17 00:00:00 2001
From: "Eric D. Helms" <ericdhelms@gmail.com>
Date: Mon, 27 Jul 2015 10:03:51 -0400
Subject: [PATCH] Refs #9848: Move config file to config directory and provide
 via gem

---
 .gitignore                                |  1 -
 config/cli.modules.d/csv.template.yml     |  6 ------
 config/cli.modules.d/foreman.template.yml |  5 -----
 config/cli.modules.d/katello.template.yml |  5 -----
 config/cli_config.template.yml            | 11 -----------
 csv.yml => config/csv.yml                 |  0
 hammer_cli_csv.gemspec                    |  2 +-
 rubygem-hammer_cli_csv.spec               | 24 +++++++++++------------
 8 files changed, 12 insertions(+), 42 deletions(-)
 delete mode 100644 config/cli.modules.d/csv.template.yml
 delete mode 100644 config/cli.modules.d/foreman.template.yml
 delete mode 100644 config/cli.modules.d/katello.template.yml
 delete mode 100644 config/cli_config.template.yml
 rename csv.yml => config/csv.yml (100%)

diff --git a/.gitignore b/.gitignore
index 769f63d..059a1a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@ rerun.txt
 pickle-email-*.html
 .project
 config/initializers/secret_token.rb
-config/*.yml
 config/cli.modules.d/*.yml
 !config/*.template.yml
 !config/cli.modules.d/*.template.yml
diff --git a/config/cli.modules.d/csv.template.yml b/config/cli.modules.d/csv.template.yml
deleted file mode 100644
index fd801c0..0000000
--- a/config/cli.modules.d/csv.template.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-# :csv:
-#   :enable_module: true
-#   :host:          'https://localhost'
-#   :username:      'admin'
-#   :password:      'changeme'
-#   :products_sync: true
diff --git a/config/cli.modules.d/foreman.template.yml b/config/cli.modules.d/foreman.template.yml
deleted file mode 100644
index 197aebb..0000000
--- a/config/cli.modules.d/foreman.template.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-# :foreman:
-#   :enable_module: true
-#   :host:          'https://localhost'
-#   :username:      'admin'
-#   :password:      'changeme'
diff --git a/config/cli.modules.d/katello.template.yml b/config/cli.modules.d/katello.template.yml
deleted file mode 100644
index 3057c0b..0000000
--- a/config/cli.modules.d/katello.template.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-# :katello:
-#   :enable_module: true
-#   :host:          'https://localhost'
-#   :username:      'admin'
-#   :password:      'changeme'
diff --git a/config/cli_config.template.yml b/config/cli_config.template.yml
deleted file mode 100644
index 38bb6bb..0000000
--- a/config/cli_config.template.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-:ui:
-  :interactive: true
-  :per_page: 20
-  :history_file: './log/history'
-
-:watch_plain: true # enable/disable color output of logger in Clamp commands
-
-:log_dir: './log'
-:log_level: 'error'
-:log_api_calls: false
-:log_size: 5 # MB
diff --git a/csv.yml b/config/csv.yml
similarity index 100%
rename from csv.yml
rename to config/csv.yml
diff --git a/hammer_cli_csv.gemspec b/hammer_cli_csv.gemspec
index 36c9e02..2b869a6 100644
--- a/hammer_cli_csv.gemspec
+++ b/hammer_cli_csv.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.summary = "CSV commands for Hammer"
   spec.description = "Hammer-CLI-CSV is a plugin for Hammer to provide bulk actions against a Katello server."
 
-  spec.files = Dir["lib/**/*.rb"]
+  spec.files = Dir["config/**/*", "lib/**/*.rb"]
   spec.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   spec.require_paths = %w(lib)
 
diff --git a/rubygem-hammer_cli_csv.spec b/rubygem-hammer_cli_csv.spec
index bad4a79..33a94b4 100644
--- a/rubygem-hammer_cli_csv.spec
+++ b/rubygem-hammer_cli_csv.spec
@@ -1,17 +1,14 @@
-%global gemname hammer_cli_csv
+%global gem_name hammer_cli_csv
 %global confdir hammer
 
-%global geminstdir %{gem_dir}/gems/%{gemname}-%{version}
-
 Summary: CSV input/output command plugin for the Hammer CLI
-Name: rubygem-%{gemname}
+Name: rubygem-%{gem_name}
 Version: 1.0.0
 Release: 5%{?dist}
 Group: Development/Languages
 License: GPLv3
 URL: https://github.com/Katello/hammer-cli-csv
-Source0: %{gemname}-%{version}.gem
-Source1: csv.yml
+Source0: %{gem_name}-%{version}.gem
 
 %if 0%{?rhel} == 6
 Requires: ruby(abi)
@@ -24,7 +21,7 @@ BuildRequires: ruby(rubygems)
 BuildRequires: rubygems-devel
 BuildRequires: ruby
 BuildArch: noarch
-Provides: rubygem(%{gemname}) = %{version}
+Provides: rubygem(%{gem_name}) = %{version}
 
 %description
 CSV input/output command plugin for the Hammer CLI.
@@ -46,20 +43,21 @@ gem install --local --install-dir .%{gem_dir} \
 
 %install
 mkdir -p %{buildroot}%{_sysconfdir}/%{confdir}/cli.modules.d
-install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{confdir}/cli.modules.d/csv.yml
+install -m 755 .%{gem_instdir}/config/csv.yml %{buildroot}%{_sysconfdir}/%{confdir}/cli.modules.d/csv.yml
 mkdir -p %{buildroot}%{gem_dir}
 cp -pa .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
 %files
-%dir %{geminstdir}
-%{geminstdir}/lib
+%dir %{gem_instdir}
+%{gem_instdir}/lib
 %config(noreplace) %{_sysconfdir}/%{confdir}/cli.modules.d/csv.yml
-%exclude %{gem_dir}/cache/%{gemname}-%{version}.gem
-%{gem_dir}/specifications/%{gemname}-%{version}.gemspec
+%exclude %{gem_dir}/cache/%{gem_name}-%{version}.gem
+%{gem_dir}/specifications/%{gem_name}-%{version}.gemspec
 
 %files doc
-%doc %{gem_dir}/doc/%{gemname}-%{version}
+%doc %{gem_dir}/doc/%{gem_name}-%{version}
+%doc %{gem_instdir}/config
 
 %changelog
 * Thu Mar 05 2015 Eric D. Helms <ericdhelms@gmail.com> 1.0.0-5