mux_tf 0.1.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72d1bbf43fcbb38f0d1a8c4bba72321f582a4ff10ce75a49c87cef89e21647ac
-  data.tar.gz: 2be9f70c1ce5a58df894866e02cd8efcfa04aa500ac394218368ef2bb88ee6fc
+  metadata.gz: 3748671ba7cadd0a528d33b4066e929df30817f1741cedd4126088e3148a1edb
+  data.tar.gz: 475c07f7d293f759082c4138d7bccb6cc2c04493fae45b2751225cdc98b6775e
 SHA512:
-  metadata.gz: e64d359f26aafe4d2fd88f00d6294132ee1ed917a5bd02eda45500d55700327e7c70fad0a053b2007db2e350c822509288e1900ad30601571bce097795d70ae4
-  data.tar.gz: 1c3b1ac826bace9b8191ce9ae55b392956ddb24e3d89d4aef86080799f408fd545d9efe4254e309a48515a9896e9f757ac20dc7938f42ee12d9f09a3a1a4cc8e
+  metadata.gz: d87307602bb62b5be1e8686c7ea3a8315ba10ffd972bc20a930296281de520b025b96b3312af2bebb6317944544b0bb3caea35aba702c4dddfe4fa4a7ca8534d
+  data.tar.gz: 9371bb009d008ec46cf2ceb0c2542dca1ce424b5ddac7555d696ea72e12a4e0a4c3c3614a8a9e8b2388c6552a98df4f2d6439ef39262f3f640a6098bfe9bdf5c

data/README.md

@@ -31,7 +31,17 @@ ROOT/
 
 ## Development
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`.
+
+## Releasing
+
+To release a new version, first bump the version number by running:
+
+```shell
+gem bump -v major|minor|patch
+```
+
+And then run `rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/lib/mux_tf.rb

@@ -23,6 +23,8 @@ require_relative './mux_tf/cli'
 require_relative './mux_tf/tmux'
 require_relative './mux_tf/terraform_helpers'
 require_relative './mux_tf/plan_formatter'
+require_relative './mux_tf/version_check'
+require_relative './mux_tf/yaml_cache'
 
 module MuxTf
 end

data/lib/mux_tf/cli/current.rb

@@ -12,6 +12,8 @@ module MuxTf
 
       class << self
         def run(args)
+          version_check
+
           if args[0] == 'cli'
             cmd_loop
             return
@@ -57,6 +59,17 @@ module MuxTf
 
       private
 
+        def version_check
+          if VersionCheck.has_updates?
+            log Paint["="*80, :yellow]
+            log "New version of #{Paint["mux_tf", :cyan]} is available!"
+            log "You are currently on version: #{Paint[VersionCheck.current_gem_version, :yellow]}"
+            log "Latest version found is: #{Paint[VersionCheck.latest_gem_version, :green]}"
+            log "Run `#{Paint["gem install mux_tf", :green]}` to update!"
+            log Paint["="*80, :yellow]
+          end
+        end
+
         def run_validate
           remedies = PlanFormatter.process_validation(validate)
           process_remedies(remedies)
@@ -225,7 +238,7 @@ module MuxTf
 
         def interactive_cmd
           define_cmd('interactive', summary: 'Apply interactively') do |_opts, _args, _cmd|
-            status = run_shell(['tf-plan-summary', PLAN_FILENAME, '-i'], return_status: true)
+            status = run_shell([tf_plan_summrary_cmd, PLAN_FILENAME, '-i'], return_status: true)
             if status != 0
               log 'Interactive Apply Failed!'
             else

data/lib/mux_tf/cli/mux.rb

@@ -46,10 +46,12 @@ module MuxTf
 
           Tmux.set 'mouse', 'on'
 
+          window_id = Tmux.list_windows.first[:id]
+
           unless tasks.empty?
             tasks.each do |task|
               log "launching task: #{task[:name]} ...", depth: 2
-              Tmux.split_window :horizontal, "#{project}:1", cmd: task[:cmd], cwd: task[:cwd]
+              Tmux.split_window :horizontal, "#{project}:#{window_id}", cmd: task[:cmd], cwd: task[:cwd]
               Tmux.select_pane task[:name]
               Tmux.tile!
               task[:commands]&.each do |cmd|

data/lib/mux_tf/plan_formatter.rb

@@ -28,7 +28,7 @@ module MuxTf
         parser.state(:error_lock_info, /Lock Info/, [:error])
         parser.state(:error, /^$/, [:error_lock_info])
 
-        parser.state(:plan_error, /^Error: /, [:refreshing])
+        parser.state(:plan_error, /^Error: /, %i[refreshing refresh_done])
 
         status = tf_plan(out: filename, detailed_exitcode: true, compact_warnings: true) do |raw_line|
           plan_output << raw_line

data/lib/mux_tf/tmux.rb

@@ -21,6 +21,13 @@ module MuxTf
         panes.find { |pane| pane[:name] == name }
       end
 
+      def list_windows
+        `tmux list-windows -F "\#{window_id},\#{window_index},\#{window_name}"`.strip.split("\n").map do |row|
+          x = row.split(',')
+          { id: x[0], index: x[1], name: x[2] }
+        end
+      end
+
       def new_session(name)
         tmux %(new-session -s #{name.inspect} -d)
       end

data/lib/mux_tf/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MuxTf
-  VERSION = '0.1.2'
+  VERSION = '0.2.4'
 end

data/lib/mux_tf/version_check.rb

@@ -0,0 +1,28 @@
+module MuxTf
+  module VersionCheck
+    def has_updates?
+      current_gem_version < latest_gem_version 
+    end
+  
+    def latest_gem_version
+      value = cache.fetch("latest_gem_version") do
+        fetcher = Gem::SpecFetcher.fetcher
+        dependency = Gem::Dependency.new "mux_tf"
+        remotes, = fetcher.search_for_dependency dependency
+        remotes.map(&:first).map(&:version).sort.last.to_s
+      end
+
+      Gem::Version.new(value)
+    end
+    
+    def current_gem_version
+      Gem::Version.new(MuxTf::VERSION)
+    end
+
+    def cache
+      @cache ||= YamlCache.new(File.expand_path("~/.mux_tf.yaml"), default_ttl: 1.hour)
+    end
+
+    extend self
+  end
+end

data/lib/mux_tf/yaml_cache.rb

@@ -0,0 +1,38 @@
+require 'yaml/store'
+
+module MuxTf
+  class YamlCache
+    def initialize(path, default_ttl:)
+      @default_ttl = default_ttl
+      @store = YAML::Store.new path
+    end
+
+    def set(key, value, ttl: @default_ttl)
+      @store.transaction do
+        @store[key] = {
+          expires_at: Time.now + ttl,
+          value: value
+        }
+      end
+    end
+
+    def fetch(key, ttl: @default_ttl)
+      info = nil
+      @store.transaction(true) do
+        info = @store[key]
+      end
+
+      if info.nil? || info[:expires_at] < Time.now
+        if block_given?
+          value = yield
+          set(key, value, ttl: ttl)
+          return value
+        else
+          raise KeyError, info.nil? ? "no value at key: #{key}" : "value expired at key: #{key}"
+        end
+      end
+
+      info[:value]
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mux_tf
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Piotr Banasik
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -149,6 +149,8 @@ files:
 - lib/mux_tf/terraform_helpers.rb
 - lib/mux_tf/tmux.rb
 - lib/mux_tf/version.rb
+- lib/mux_tf/version_check.rb
+- lib/mux_tf/yaml_cache.rb
 - mux_tf.gemspec
 homepage: https://github.com/piotrb/mux_tf
 licenses: