[neon/infrastructure/pangea-gemstash] /: more clean up

[Carlos De Maine]

Git commit 550c43d446817bd3726a8ee439d9000faee9f979 by Carlos De Maine.
Committed on 26/05/2023 at 00:55.
Pushed by carlosdem into branch 'master'.

more clean up

M  +6    -3    Gemfile
M  +4    -2    Gemfile.lock
M  +2    -0    Gemfile.lock.old
M  +2    -2    Jenkinsfile
M  +4    -3    build_gem.rb
D  +0    -40   config.rb
M  +3    -1    start.sh

https://invent.kde.org/neon/infrastructure/pangea-gemstash/-/commit/550c43d446817bd3726a8ee439d9000faee9f979

diff --git a/Gemfile b/Gemfile
index 030630e..bfc9c13 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,14 @@
 # ./Gemfile
 require "cgi"
-source "https://gem.cache.pangea.pub"
+#source "https://gem.cache.pangea.pub"
+# uncomment for local testing
 source "http://localhost:9292"
 gem "releaseme"
-gem "jenkins_junit_builder"
+#gem "jenkins_junit_builder"
 
-source "https://gem.cache.pangea.pub/upstream/#{CGI.escape("https://rubygems.org")}" do
+#source "https://gem.cache.pangea.pub/upstream/#{CGI.escape("https://rubygems.org")}" do
+# uncomment for local testing
+source "http://localhost:9292/upstream/#{CGI.escape("https://rubygems.org")}" do
 #gem "farraday"
 gem "gemstash"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 2498ad6..af300fa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,15 +1,17 @@
 GEM
-  remote: https://gem.cache.pangea.pub/
+  remote: http://localhost:9292/
   specs:
+    releaseme (0.0.20221129.1049)
 
 GEM
-  remote: https://gem.cache.pangea.pub/upstream/https%3A%2F%2Fmy.gem-source.local/
+  remote: http://localhost:9292/upstream/https%3A%2F%2Frubygems.org/
   specs:
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  releaseme
 
 BUNDLED WITH
    2.4.13
diff --git a/Gemfile.lock.old b/Gemfile.lock.old
index f3f6de7..c7efbb4 100644
--- a/Gemfile.lock.old
+++ b/Gemfile.lock.old
@@ -1,3 +1,5 @@
+# original lockfile from geminabox
+
 GEM
   remote: https://rubygems.org/
   specs:
diff --git a/Jenkinsfile b/Jenkinsfile
index e9047cb..6a75b30 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,7 +5,7 @@ env.GEM_PATH = '/var/lib/jenkins/.gem/ruby/2.2.0:/var/lib/jenkins/.gems/bundler'
 parallel(
   "git[releaseme]": {
     cleanNode('master') {
-      git_clone 'https://github.com/blue-systems/pangea-geminabox', 'geminabox'
+      git_clone 'https://invent.kde.org/neon/infrastructure/pangea-gemstash.git', 'gemstash'
       git_clone 'https://anongit.kde.org/releaseme', 'releaseme'
       sh 'ls -lah'
       sh 'ls -lah releaseme'
@@ -14,7 +14,7 @@ parallel(
   },
   "git[jenkins_junit_builder]": {
     cleanNode('master') {
-      git_clone 'https://github.com/blue-systems/pangea-geminabox', 'geminabox'
+      git_clone 'https://invent.kde.org/neon/infrastructure/pangea-gemstash.git', 'gemstash'
       git_clone 'https://github.com/hsitter/jenkins_junit_builder', 'jenkins_junit_builder'
       sh 'ls -lah'
       sh 'ls -lah jenkins_junit_builder'
diff --git a/build_gem.rb b/build_gem.rb
index 9a15470..955c94d 100644
--- a/build_gem.rb
+++ b/build_gem.rb
@@ -105,6 +105,7 @@ Dir.mktmpdir do |tmpdir|
   end
 end
 
-# .gem/credentials controls API_KEY used here.
-system('gem', 'push', gem_file,
-       '--host', 'https://gem.cache.pangea.pub') || raise
+# .gem/credentials has our neon_key used here.
+# install to the private directory as these are private gems for tooling only
+system('gem', 'push', gem_file, '--key' 'neon_key'
+       '--host', 'https://gem.cache.pangea.pub/private') || raise
diff --git a/config.rb b/config.rb
deleted file mode 100644
index f494ca9..0000000
--- a/config.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-#
-# Copyright © 2017 Harald Sitter <sitter at kde.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License or (at your option) version 3 or any later version
-# accepted by the membership of KDE e.V. (or its successor approved
-# by the membership of KDE e.V.), which shall act as a proxy
-# defined in Section 14 of version 3 of the license.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-require 'yaml'
-
-# Configuration
-module Config
-  module_function
-
-  XDG_CONFIG_HOME = ENV.fetch('XDG_CONFIG_HOME', "#{Dir.home}/.config").freeze
-
-  def data
-    @data ||= YAML.load_file("#{XDG_CONFIG_HOME}/pangea_build_gem.yaml")
-  end
-
-  def method_missing(meth, *)
-    data.fetch(meth.to_s) || super
-  end
-
-  def respond_to_missing?(meth, *)
-    data.key?(meth.to_s) || super
-  end
-end
diff --git a/start.sh b/start.sh
index 339e304..8c1db85 100755
--- a/start.sh
+++ b/start.sh
@@ -40,4 +40,6 @@ bundle update --bundler
 # install, configure and start gemstash
 gem install gemstash
 cp -vf config.yaml .gemstash/config.yaml
-gem exec gemstash start --no-daemonize
+gemstash start --no-daemonize
+# maybe use bundle exec in the future
+#gem exec gemstash start --no-daemonize