i2c2 1.0.0.beta1 → 1.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87d5c264cab24fe1fef276824f33d806b592c573cd52436b02948f5dfe234835
-  data.tar.gz: a081ae9075942485571ec188a77bccfe9c4ae9b5145d5b3112c50782c8a5cd23
+  metadata.gz: 7038fe5ca1884acbd69308cc5d4b80bdca193a50e3dac700ed97f13349212fcb
+  data.tar.gz: 912bde1276d5de58bd61321133df61c36b6bc1e5a89fe0f69826adaf9e3e1f32
 SHA512:
-  metadata.gz: 254be2e2c757bbb2b429ea300d1834d50992f482b7ab4dce4e20f44767072e78cce3d438de62d39328689ab1e0bd8d1aacb0141f0ab9ddea9463b356eda932d3
-  data.tar.gz: b684000ef28ff654bdaea3981d9cc68555c76c2d0b47787cb4e51dbf07ac3577afe09c373904c997a7773ca6b41972970000fd1eb83ecd6d7939200d0f0244b9
+  metadata.gz: a73164c3d05331b5e3ce4500ae226388a5dc113b12b541619ff7d8637584b8b4ffc99223b3d6c161d63d706c984af769b3a4e5b6bbfb9de719f582407bbb57d6
+  data.tar.gz: 6583acdc831c67a407fa237d6b7c2900f1653b7a9dc8b43713f9633d0011ed4b93e5685a7a146bb06bba27343b6b8367a7c16662ab64fe85d58d77dbd347b437

data/CHANGELOG.md

@@ -2,7 +2,19 @@
 
 ## [Unreleased]
 
-## [1.0.0.alpha1] 2019-05-11
+## [1.0.0.beta4] 2019-05-15
+### Changed
+- Fix problem after config file convertion to version 2
+
+## [1.0.0.beta3] 2019-05-15
+### Changed
+- Fix a circular dependency between i2c2 and i2c2
+
+## [1.0.0.beta2] 2019-05-15
+### Changed
+- Fix merge error on "-m" option [beta1 failed]
+
+## [1.0.0.beta1] 2019-05-11
 ### Changed
 - Fix merge error on "-m" option
 

data/Gemfile

@@ -1,8 +1,10 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
+gem "rb-scpt", "~> 1.0.1"
+
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
@@ -11,4 +13,3 @@ group :development do
   gem "shoulda"
   gem "builder"
 end
-

data/Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
@@ -45,6 +45,7 @@ GEM
     public_suffix (2.0.5)
     rack (1.6.11)
     rake (12.3.2)
+    rb-scpt (1.0.3)
     rdoc (5.1.0)
     semver (1.0.1)
     shoulda (2.11.3)
@@ -57,6 +58,7 @@ DEPENDENCIES
   builder
   bundler (>= 1.0.0)
   jeweler (= 2.1.2)
+  rb-scpt (~> 1.0.1)
   shoulda
 
 BUNDLED WITH

data/Rakefile

@@ -21,8 +21,7 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{csshX like - cluster ssh using iTerm2 panes - based on i2cssh}
   gem.email = "dx7@pm.me"
   gem.authors = ["dx7", "Wouter de Bie"]
-  # dependencies defined in Gemfile
-  gem.add_dependency 'rb-scpt', "~> 1.0.1"
+  # dependencies are defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
 
@@ -42,5 +41,6 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "i2c2 #{version}"
   rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('CHANGELOG*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-1.0.0.beta1
+1.0.0.beta4

data/bin/i2c2

@@ -8,6 +8,19 @@ require 'yaml'
 
 @i2_options, ssh_options, @servers, @clusters, @ssh_environment, opts_from_cmdline = [], [], [], {}, [], {}
 
+def debug_vars
+  p '-----------------------------'
+  p '@i2_options'
+  p @i2_options
+  p '@servers'
+  p @servers
+  p '@clusters'
+  p @clusters
+  p '@ssh_environment'
+  p @ssh_environment
+  p '-----------------------------'
+end
+
 def get_hosts(c)
     c.each do |clus|
 
@@ -69,19 +82,18 @@ def set_options(config_hash, login_override=nil)
 end
 
 if File.exists?(@config_file)
-    config_hash = YAML.load File.read @config_file
+  config_hash = YAML.load(File.read(@config_file))
 
-    # Read config and set defaults from config
-    if config_hash["version"] && config_hash["version"].to_i >= 2
-        set_options(config_hash)
-        @clusters = config_hash["clusters"]
-    else
-        # Convert version 1 format to version 2
-        @clusters = config_hash["clusters"].inject({}){|m, c| m[c[0]] = {"hosts" => c[1]}; m}
-    end
+  # Convert version 1 format to version 2
+  if config_hash && config_hash['version'].to_i < 2
+    config_hash['clusters'] = config_hash['clusters'].inject({}) { |m, c| m[c[0]] = { 'hosts' => c[1] }; m }
+  end
 
+  # Read config and set defaults from config
+  set_options(config_hash)
+  @clusters = config_hash["clusters"]
 else
-    set_options({})
+  set_options({})
 end
 
 
@@ -94,11 +106,13 @@ optparse = OptionParser.new do |opts|
         get_hosts(c)
     end
 
+
     opts.on '-m', '--machines a,b,c', Array,
-        'Comma-separated list of hosts' do |servers|
+        'Comma-separated list of hosts' do |h|
 
-        @servers = [servers]
-        @i2_options << set_options({ 'hosts' => @servers.first })
+        # Add to servers array and get a clone of default options
+        @servers << h
+        @i2_options << @i2_options.first.clone
         if @ssh_environment.empty?
             @ssh_environment << {}
         else
@@ -267,7 +281,7 @@ end
 
 # Drop default options
 if @i2_options.size > @servers.size
-    @i2_options.pop
+    @i2_options.shift
 end
 
 if @ssh_environment.size > @servers.size

data/i2c2.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: i2c2 0.99.1 ruby lib
+# stub: i2c2 1.0.0.beta4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "i2c2"
-  s.version = "1.0.0.beta1"
+  s.version = "1.0.0.beta4"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["dx7", "Wouter de Bie"]
-  s.date = "2019-05-11"
+  s.date = "2019-05-16"
   s.description = "csshX like - cluster ssh using iTerm2 panes - based on i2cssh"
   s.email = "dx7@pm.me"
   s.executables = ["i2c2"]
@@ -37,31 +37,31 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/dx7/i2c2"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.7.8"
+  s.rubygems_version = "3.0.3"
   s.summary = "csshX like - cluster ssh using iTerm2 panes - based on i2cssh"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rb-scpt>, ["~> 1.0.1"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["= 2.1.2"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<builder>, [">= 0"])
-      s.add_runtime_dependency(%q<rb-scpt>, ["~> 1.0.1"])
     else
+      s.add_dependency(%q<rb-scpt>, ["~> 1.0.1"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["= 2.1.2"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<builder>, [">= 0"])
-      s.add_dependency(%q<rb-scpt>, ["~> 1.0.1"])
     end
   else
+    s.add_dependency(%q<rb-scpt>, ["~> 1.0.1"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, ["= 2.1.2"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<builder>, [">= 0"])
-    s.add_dependency(%q<rb-scpt>, ["~> 1.0.1"])
   end
 end
 

data/lib/i2c2.rb

@@ -15,7 +15,7 @@ class I2c2
         @pane_menu = @sys_events.processes["iTerm2"].menu_bars[1].menu_bar_items["Window"].menus["Window"].menu_items["Select Split Pane"].menus["Select Split Pane"]
         @shell_menu = @sys_events.processes["iTerm2"].menu_bars[1].menu_bar_items["Shell"].menus["Shell"]
 
-        @profile = @i2_options.first[:profile] || "Default"
+        @profile = i2_options.first[:profile] || "Default"
         @shell = "/usr/bin/env #{@i2_options.first[:shell] || 'bash'}"
 
         @iterm.create_window_with_profile(@profile, :command => "#{@shell} -l")
@@ -25,12 +25,12 @@ class I2c2
             compute_geometry
             split_session
             start_ssh
-            enable_broadcast if @i2_options.first[:broadcast]
+            enable_broadcast if i2_options.first[:broadcast]
             @servers.shift
             @i2_options.shift
             @ssh_environment.shift
 
-            if !@servers.empty?  && @i2_options.first[:tabs] then
+            if !@servers.empty?  && i2_options.first[:tabs] then
                 # @iterm.create_tab(@profile)
                 @window.create_tab_with_default_profile()
                 @session_index = 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i2c2
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.beta4
 platform: ruby
 authors:
 - dx7
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-11 00:00:00.000000000 Z
+date: 2019-05-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rb-scpt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -67,20 +81,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rb-scpt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
 description: csshX like - cluster ssh using iTerm2 panes - based on i2cssh
 email: dx7@pm.me
 executables:
@@ -123,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: csshX like - cluster ssh using iTerm2 panes - based on i2cssh