From 21e3d6490496573f25ef77fe8172766ac7d1a736 Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Sat, 21 Apr 2018 13:27:05 +0200
Subject: the great makeover - standardize layout, alignment, indentation

---
 lib/oxidized/cli.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/oxidized/cli.rb')

diff --git a/lib/oxidized/cli.rb b/lib/oxidized/cli.rb
index 9a09d41..c29e269 100644
--- a/lib/oxidized/cli.rb
+++ b/lib/oxidized/cli.rb
@@ -40,7 +40,7 @@ module Oxidized
     end
 
     def parse_opts
-      opts = Slop.new(:help=>true) do
+      opts = Slop.new(:help => true) do
         on 'd', 'debug', 'turn on debugging'
         on 'daemonize',  'Daemonize/fork the process'
         on 'v', 'version', 'show version' do
@@ -62,7 +62,7 @@ module Oxidized
     def write_pid
       if pidfile?
         begin
-          File.open(pidfile, ::File::CREAT | ::File::EXCL | ::File::WRONLY){|f| f.write("#{Process.pid}") }
+          File.open(pidfile, ::File::CREAT | ::File::EXCL | ::File::WRONLY) { |f| f.write("#{Process.pid}") }
           at_exit { File.delete(pidfile) if File.exists?(pidfile) }
         rescue Errno::EEXIST
           check_pid
-- 
cgit v1.2.3


From 60c3408bfc0f6aa5a89013f99e0763719440f29b Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Wed, 25 Apr 2018 19:09:40 +0300
Subject: set version from git

you still need to bump version.rb, as 'rake tag' will use that to create
git tag, which we need :>
---
 lib/oxidized/cli.rb     |  2 +-
 lib/oxidized/version.rb | 11 +++++++++++
 oxidized.gemspec        |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'lib/oxidized/cli.rb')

diff --git a/lib/oxidized/cli.rb b/lib/oxidized/cli.rb
index c29e269..23cc28c 100644
--- a/lib/oxidized/cli.rb
+++ b/lib/oxidized/cli.rb
@@ -44,7 +44,7 @@ module Oxidized
         on 'd', 'debug', 'turn on debugging'
         on 'daemonize',  'Daemonize/fork the process'
         on 'v', 'version', 'show version' do
-          puts Oxidized::VERSION
+          puts Oxidized::VERSION_FULL
           Kernel.exit
         end
       end
diff --git a/lib/oxidized/version.rb b/lib/oxidized/version.rb
index 9a92133..0d90e34 100644
--- a/lib/oxidized/version.rb
+++ b/lib/oxidized/version.rb
@@ -1,3 +1,14 @@
 module Oxidized
   VERSION = '0.21.0'
+  VERSION_FULL = '0.21.0-175-gcc22060'
+  def self.version_set
+    Oxidized.send(:remove_const, :VERSION_FULL)
+    const_set(:VERSION_FULL, %x(git describe --tags).chop)
+    Oxidized.send(:remove_const, :VERSION)
+    const_set(:VERSION, %x(git describe --tags --abbrev=0).chop)
+    file = File.readlines(__FILE__)
+    file[1] = "  VERSION = '%s'\n" % VERSION
+    file[2] = "  VERSION_FULL = '%s'\n" % VERSION_FULL
+    File.write(__FILE__, file.join)
+  end
 end
diff --git a/oxidized.gemspec b/oxidized.gemspec
index 6fcd5c5..06e1af9 100644
--- a/oxidized.gemspec
+++ b/oxidized.gemspec
@@ -1,6 +1,7 @@
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'oxidized/version'
+Oxidized.version_set
 
 Gem::Specification.new do |s|
   s.name              = 'oxidized'
-- 
cgit v1.2.3