From e21b9c875e5cce36bff7865bd4be053b24034127 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 27 Apr 2017 15:22:19 +0200
Subject: [PATCH] Bump version, improve how version is stored for better commit
 history (#2526)

---
 app/helpers/http_helper.rb           |  2 +-
 app/presenters/instance_presenter.rb |  2 +-
 app/views/api/v1/instances/show.rabl |  2 +-
 lib/mastodon/version.rb              | 28 +++++++++++++++++++++++++++-
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/app/helpers/http_helper.rb b/app/helpers/http_helper.rb
index 1e1ac82567..1697de746e 100644
--- a/app/helpers/http_helper.rb
+++ b/app/helpers/http_helper.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module HttpHelper
-  USER_AGENT = "#{HTTP::Request::USER_AGENT} (Mastodon/#{Mastodon::VERSION}; +http://#{Rails.configuration.x.local_domain}/)"
+  USER_AGENT = "#{HTTP::Request::USER_AGENT} (Mastodon/#{Mastodon::Version}; +http://#{Rails.configuration.x.local_domain}/)"
 
   def http_client(options = {})
     timeout = { write: 10, connect: 10, read: 10 }.merge(options)
diff --git a/app/presenters/instance_presenter.rb b/app/presenters/instance_presenter.rb
index e583a38d0e..9a69809d0e 100644
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@@ -27,6 +27,6 @@ class InstancePresenter
   end
 
   def version_number
-    Mastodon::VERSION
+    Mastodon::Version
   end
 end
diff --git a/app/views/api/v1/instances/show.rabl b/app/views/api/v1/instances/show.rabl
index e1d4700a0c..8ab3fe0cae 100644
--- a/app/views/api/v1/instances/show.rabl
+++ b/app/views/api/v1/instances/show.rabl
@@ -4,4 +4,4 @@ node(:uri)         { site_hostname }
 node(:title)       { Setting.site_title }
 node(:description) { Setting.site_description }
 node(:email)       { Setting.site_contact_email }
-node(:version)     { Mastodon::VERSION }
+node(:version)     { Mastodon::Version }
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 51cf2e5f82..4ea9bab360 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -1,5 +1,31 @@
 # frozen_string_literal: true
 
 module Mastodon
-  VERSION = '1.2.2'
+  module Version
+    module_function
+
+    def major
+      1
+    end
+
+    def minor
+      3
+    end
+
+    def patch
+      0
+    end
+
+    def pre
+      nil
+    end
+
+    def to_a
+      [major, minor, patch, pre].compact
+    end
+
+    def to_s
+      to_a.join('.')
+    end
+  end
 end