sycersion 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 296451fb7d60ad509421f5bfdfa718e726a06f7377f063a4f27a5176fc3f8a8c
-  data.tar.gz: 8291b661655aed0ccce7f24e085e26185e8f6a43d7bca101c4dfcc77a34911a7
+  metadata.gz: 74fca173531567bcc02f1e07e07fbed00441208001ccf5efc9e2329a3a530036
+  data.tar.gz: 7ecae7f75bcbbfc67b8837956900a7c2dbb37c5a4daf7cbaec9ebf58006b57e0
 SHA512:
-  metadata.gz: a21a9851fb8b5961565423189306c44ee6189d18c101e5f0c690d97977c11418eb5bd09c04e3ca4b5b80a7a42a05264e1867bba1a4a28eb9c428cb2c5e138f98
-  data.tar.gz: 94bcfc3960cc42798e5620f7bb391a10f6d945021e734ae1099bb2f88b333d71faf304aef964d16c324acd606ebe2533eff702be7f7164cffc18e46fab996a3b
+  metadata.gz: a30908c13e1ee3701e4b234506b2b2a89289e5aeef11b108beabc2690f5b3dac691b09006a86aa169ef8a0d01b8a837b0981f6324ec240a7ca72836aa9dc9a41
+  data.tar.gz: 6a06dba6e6ca65fcd8558a1b9a89f91e0d214c82e7ff8351803d3bdc6b6d1beba34d3ce0f8685f2026c436250323da8eb8915ee0a615328653b21ab549062789

data/.sycersion/environment.yml

@@ -1,3 +1,5 @@
 ---
 - ".sycersion/version"
-- 0.1.0
+- 0.2.1
+-
+-

data/.sycersion/version

@@ -0,0 +1 @@
+0.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sycersion (0.1.0)
+    sycersion (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/sycersion/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sycersion
-  VERSION = File.exist?('.sycersion/version') ? File.read('.sycersion/version') : '0.1.0'
+  VERSION = File.exist?('.sycersion/version') ? File.read('.sycersion/version') : '0.2.1'
 end

data/lib/sycersion/version_environment.rb

@@ -42,25 +42,39 @@ module Sycersion
     def summary_of_environment
       puts "\nWhere to find the configuration files"
       puts "-------------------------------------\n"
-      puts "\nDirectory:          #{SYCERSION_DIR}"
-      puts "Configuration file: #{SYCERSION_ENV}\n"
-      puts "\nChange the configuration file only if you know what you are doing."
-      puts 'Otherwise run `sycersion --init` again.'
+      puts "\nDirectory:                      #{SYCERSION_DIR}"
+      puts "Configuration file:             #{SYCERSION_ENV}\n"
+      puts "Application version-file:       #{@app_ver_file}" if @app_ver_file
+      puts "Application version assignment: #{@version_string}" if @version_string
+      puts "\nIf you change the configuration file and encounter odd behaviour,"
+      puts 're-run `sycersion --init`.'
     end
 
     def determine_version_and_version_file
       files = Dir.glob('**/*version*')
       files.each do |file|
-        File.readlines(file, chomp: true).each do |line|
-          scan_result = line.scan(Sycersion::SEMVER_LAX_REGEX)
-          if scan_result[0]
-            @version_files[file] = [scan_result[0], line]
-            break
-          end
+        next if File.directory?(file)
+
+        retrieve_version_files(file)
+      end
+    end
+
+    def retrieve_version_files(file)
+      File.readlines(file, chomp: true).each do |line|
+        scan_result = scan_for_version(line)
+        if scan_result
+          @version_files[file] = [scan_result, line]
+          break
         end
       end
     end
 
+    def scan_for_version(line)
+      line.scan(Sycersion::SEMVER_LAX_REGEX)[0]
+    rescue ArgumentError
+      []
+    end
+
     def prompt_version_and_version_file
       if File.exist?(SYCERSION_VER)
         resume_version_and_version_file
@@ -92,14 +106,14 @@ module Sycersion
     end
 
     def select_version_and_version_file
-      puts "\nFound version-files\n"
-      puts "-------------------\n"
+      puts "\nFound files with versions\n"
+      puts "-------------------------\n"
       list_versions_and_version_files
-      print "\nChoose version-file and version with number or hit return for [0]: "
+      print "\nChoose file and version with number or hit return for [0]: "
       selection = gets.chomp.to_i
-      app_version_file = @version_files.keys[selection]
-      @version = Sycersion::Semver.version(@version_files[app_version_file][0])
-      @version_string = @version_files[@version_file[1]]
+      @app_ver_file = @version_files.keys[selection]
+      @version = Sycersion::Semver.version(@version_files[@app_ver_file][0])
+      @version_string = @version_files[@app_ver_file][1].strip
     end
 
     def list_versions_and_version_files
@@ -130,15 +144,28 @@ module Sycersion
 
       In your application you can now access the version with
 
-      > File.read(#{version_file})
+      > File.read('#{version_file}')
 
-      If you application framework has a defined place to assign
-      the version you could do like so
+      If you application framework has a defined place to assign the version you
+      could do like so
 
-      > version = File.read(#{version_file})
+      > version = if File.exist? ? File.read('#{version_file}') : 'No VERSION!'
+      #{describe_adoption_of_version_file}
       CODE_SNIP
     end
 
+    def describe_adoption_of_version_file
+      return unless @app_ver_file && @version_string
+
+      <<-PROPOSAL
+
+      In #{@app_ver_file} you can change the version assignment to read from
+      #{@version_file} and change it accordingly.
+
+      #{@version_string}
+      PROPOSAL
+    end
+
     def save
       create_environment
     end
@@ -147,7 +174,7 @@ module Sycersion
       FileUtils.mkdir(SYCERSION_DIR) unless Dir.exist?(SYCERSION_DIR)
       File.open(@version_file, 'w') { |f| f.write(@version) }
       File.open(SYCERSION_ENV, 'w') do |f|
-        YAML.dump([@version_file, @version], f)
+        YAML.dump([@version_file, @version, @app_ver_file, @version_string], f)
       end
     rescue IOError => e
       puts e.message
@@ -158,12 +185,17 @@ module Sycersion
         @version_file, @version = YAML.load_file(SYCERSION_ENV)
         true
       else
-        @version_file = SYCERSION_VER
-        @version = '0.1.0'
-        @version_files = {}
-        @version_string = ''
+        load_environment_default
         false
       end
     end
+
+    def load_environment_default
+      @version_file = SYCERSION_VER
+      @version = '0.1.0'
+      @version_files = {}
+      @app_ver_file = ''
+      @version_string = ''
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sycersion
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Pierre Sugar
@@ -79,6 +79,7 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".sycersion/environment.yml"
+- ".sycersion/version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile