flazm_ruby_helpers 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5cf0748fd56bb9c92fd5e26d4f636255ef78bd4647502293421b7b74a6db7d5
-  data.tar.gz: a93aeea8bbec25c4383cbfa608e58e65ee8380be0efd951957c302916d9d589a
+  metadata.gz: 96ceeb0b5ab126e4604f72e976f6c26577f6d2ce089c589063781094cb973da4
+  data.tar.gz: 23f8d7ce8b4653975cee752e354e2c96b6c4ef4df406b310b9ad14bd9e15e7ab
 SHA512:
-  metadata.gz: e5b1fd8ba4d351a904e8e13cb944cd22ae2caadc613884e5b9eee2b9748f1382329ba127dd2c04c40d35ef42f69a83c6c8a8d7d7c246049626f51d7a372151f3
-  data.tar.gz: 50cac9775f4bc39a8d290beea1e62803b51f5035d7738f47f1320fece0bfe4712ec3d35b37b0e8f0d66522add06a1995ad3459175519d824ecf55db07263a866
+  metadata.gz: 136eeab91ff921911297ab261b6ccfa6e4c18942723a69e8a38813f6a00cbabf971049f1e234fffefff257942ee846d27fcc5f91d491cc406b21b504ed2697b3
+  data.tar.gz: 5dd0cd11c403934ae55899b2f596361936aeb2162330ecbeafbdf60f06bc7c636bf89efa2796cd05e4cd517eee7502a5e3c829b316918530f354da3c56009ffe

data/.gitignore

@@ -0,0 +1,9 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/Rakefile

@@ -2,7 +2,7 @@
 
 require 'bundler/gem_tasks'
 require 'open3'
-require_relative 'lib/flazm_ruby_helpers/rake_helper'
+require_relative 'lib/flazm_ruby_helpers/os'
 
 spec_file = Gem::Specification.load('flazm_ruby_helpers.gemspec')
 
@@ -10,5 +10,10 @@ task default: :build
 
 task :publish do
   cmd_gem = "gem push pkg/flazm_ruby_helpers-#{spec_file.version}.gem"
-  _output, _status = FlazmRubyHelpers::RakeHelper.exec(cmd_gem)
+  _output, _status = FlazmRubyHelpers::Os.exec(cmd_gem)
+end
+
+task :install do
+  cmd_gem = "bundle exec gem install pkg/flazm_ruby_helpers-#{spec_file.version}.gem"
+  _output, _status = FlazmRubyHelpers::Os.exec(cmd_gem)
 end

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/flazm_ruby_helpers.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_runtime_dependency 'bundler', '~> 2.0'
+  spec.add_dependency 'git', '~> 1.5.0'
 end

data/lib/flazm_ruby_helpers/{class_helper.rb → class.rb}

@@ -2,7 +2,7 @@
 
 module FlazmRubyHelpers
   # Define methods to handle default initialization behavior
-  module ClassHelper
+  module Class
     def initialize_variables(config = {})
       # define the defaults method in the class that includes this
       # defaults method returns a hash of instance variables mapped to values

data/lib/flazm_ruby_helpers/data_structures.rb

@@ -5,15 +5,15 @@ require 'json'
 
 # Adding transversal logic
 class ::Array # rubocop:disable Style/ClassAndModuleChildren
-  def walk_values(vproc)
+  def visit_values(vproc)
     map do |array_item|
-      array_item.is_a?(Hash) || array_item.is_a?(Array) ? array_item.walk_values(vproc) : vproc.call(array_item)
+      array_item.is_a?(Hash) || array_item.is_a?(Array) ? array_item.visit_values(vproc) : vproc.call(array_item)
     end
   end
 
-  def walk_keys(kproc)
+  def visit_keys(kproc)
     map do |array_item|
-      array_item.is_a?(Hash) || array_item.is_a?(Array) ? array_item.walk_keys(kproc) : array_item
+      array_item.is_a?(Hash) || array_item.is_a?(Array) ? array_item.visit_keys(kproc) : array_item
     end
   end
 
@@ -33,16 +33,16 @@ class ::Hash # rubocop:disable Style/ClassAndModuleChildren
     merge(second, &merger)
   end
 
-  def walk_values(vproc)
+  def visit_values(vproc)
     map do |key, value|
-      value.is_a?(Hash) || value.is_a?(Array) ? { key => value.walk_values(vproc) } : { key => vproc.call(value) }
+      value.is_a?(Hash) || value.is_a?(Array) ? { key => value.visit_values(vproc) } : { key => vproc.call(value) }
     end.reduce({}, :merge)
   end
 
-  def walk_keys(kproc)
+  def visit_keys(kproc)
     map do |key, value|
       if value.is_a?(Hash) || value.is_a?(Array)
-        { kproc.call(key) => value.walk_keys(kproc) }
+        { kproc.call(key) => value.visit_keys(kproc) }
       else
         { kproc.call(key) => value }
       end

data/lib/flazm_ruby_helpers/http.rb

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require 'net/http'
+
+module FlazmRubyHelpers
+  module Http
+    def self.wait_for_urls(urls)
+      urls.each do |url|
+        uri = URI(url)
+        error = true
+        puts "uri: #{uri}"
+        Net::HTTP.start(uri.host, uri.port, read_timeout: 5, max_retries: 12) do |http|
+          while error
+            begin
+              response = http.request(Net::HTTP::Get.new(uri))
+              error = false
+            rescue EOFError
+              retry
+            end
+          end
+          raise Exception unless response.code == '200'
+
+          puts "up: #{url}"
+        end
+      end
+    end
+  end
+end

data/lib/flazm_ruby_helpers/{rake_helper.rb → os.rb}

@@ -3,12 +3,9 @@
 # frozen_string_literal: true
 
 require 'open3'
-require 'net/http'
-require 'bunny'
-require 'json'
 
 module FlazmRubyHelpers
-  module RakeHelper
+  module Os
     def self.exec(command, stream: true)
       output = [] ; threads = [] ; status = nil
       Open3.popen3(command) do |_stdin, stdout, stderr, wait_thr|
@@ -25,25 +22,5 @@ module FlazmRubyHelpers
       end
       return output, status
     end
-
-    def self.wait_for_urls(urls)
-      urls.each do |url|
-        uri = URI(url)
-        error = true
-        Net::HTTP.start(uri.host, uri.port, read_timeout: 5, max_retries: 12) do |http|
-          while error
-            begin
-              response = http.request(Net::HTTP::Get.new(uri))
-              error = false
-            rescue EOFError
-              retry
-            end
-          end
-          raise Exception unless response.code == '200'
-
-          puts "up: #{url}"
-        end
-      end
-    end
   end
 end

data/lib/flazm_ruby_helpers/project.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'git'
+require 'flazm_ruby_helpers/os'
+#require 'rubygems/version'
+
+module FlazmRubyHelpers
+  module Project
+    # Helper module to publish git projects
+    module Git
+      # Depends on version file
+
+      #git show origin/master:VERSION
+      def self.publish(version, remote, branch)
+        g = ::Git.init
+        g.fetch
+
+        validate(g, version)
+        
+        g.add_tag(version)
+        puts "Added git tag '#{version}'"
+        _output, push_success = FlazmRubyHelpers::Os.exec("git push #{remote} #{version}:master")
+        raise "ERROR: Failed to push to #{remote} for branch #{branch}" unless push_success
+        _output, tag_success = FlazmRubyHelpers::Os.exec("git push --tags #{remote}")
+        raise "ERROR: Failed to push to #{remote} for branch #{branch}" unless tag_success
+      end
+
+      private
+
+      def self.validate(g, version)
+        previous_version = g.object('origin/master:VERSION').contents
+        raise "ERROR: New version (#{version}) is not greater than previous version (#{previous_version})" if ::Gem::Version.new(previous_version) > ::Gem::Version.new(version)
+        
+        num_changes = g.log.between('origin/master', 'HEAD').size
+        raise 'ERROR: Local workspace has changes not checked in' unless g.status.changed.size == 0
+        raise "ERROR: Should only have 1 change, have #{num_changes} changes.  Please squash your commit" if num_changes != 1
+      end
+    end
+
+    # Helper module to publish docker projects
+    module Docker
+      def self.build(build_cmd)
+        output, success = FlazmRubyHelpers::Os.exec(build_cmd)
+        match = output[-1].match(/Successfully built (.*)$/i)
+        raise 'failed to build docker image' unless success && match
+      
+        match.captures[0]
+      end
+
+      def self.tag(docker_image_name, version, image_id)
+        puts "Docker id #{image_id} => tag #{docker_image_name}:#{version}"
+        tag_cmd = "docker tag #{image_id} #{docker_image_name}:#{version}"
+        _output, success = FlazmRubyHelpers::Os.exec(tag_cmd)
+        raise 'docker tag failed' unless success
+      end
+
+      def self.publish(image_name, version)
+        _output, docker_push_success = FlazmRubyHelpers::Os.exec("docker push #{image_name}:#{version}")
+        raise "Docker push failed for image #{image_name}:#{version}" unless docker_push_success
+      end
+
+      def self.validate
+      end
+
+    end
+
+    # Helper module to publish gem projects
+    module Gem
+      def self.publish(gem_name, version)
+        _output, gem_push_success = FlazmRubyHelpers::Os.exec("gem push pkg/#{gem_name}-#{version}.gem")
+        raise "Gem push failed for #{gem_name}:#{version}" unless gem_push_success
+      end
+
+      def self.validate
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flazm_ruby_helpers
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ryan Fortman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-16 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 description: 
 email:
 - r.fortman.dev@gmail.com
@@ -45,17 +59,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - VERSION
 - flazm_ruby_helpers.gemspec
-- lib/flazm_ruby_helpers/class_helper.rb
+- lib/flazm_ruby_helpers/class.rb
 - lib/flazm_ruby_helpers/data_structures.rb
-- lib/flazm_ruby_helpers/rake_helper.rb
-- pkg/consul_watcher-0.0.1.gem
-- pkg/flazm_ruby_helpers-0.0.1.gem
+- lib/flazm_ruby_helpers/http.rb
+- lib/flazm_ruby_helpers/os.rb
+- lib/flazm_ruby_helpers/project.rb
 homepage: https://github.com/fortman/flazm_ruby_helpers
 licenses: []
 metadata: {}