hobo-inviqa 0.0.10.pre.rc9 → 0.0.10.pre.rc10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/Gemfile.lock +1 -1
- data/bin/hobo +5 -8
- data/hobo.gemspec +7 -1
- data/lib/hobo.rb +1 -1
- data/lib/hobo/cli.rb +1 -2
- data/lib/hobo/init/bundler_context.rb +23 -0
- data/lib/hobo/lib/host_check.rb +0 -1
- data/lib/hobo/lib/host_check/vagrant.rb +1 -1
- data/lib/hobo/tasks/deps.rb +0 -1
- data/lib/hobo/tasks/vm.rb +1 -3
- data/lib/hobo/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
ZDY4ZDE1ZjE3NGQ0NGY1M2Q5MDRiZjJmMTIwZjA3YTYwOTlmYjIwMQ==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
YzVlNGM2YTI2OTRlNzNlODYyNjVkZTVjYWI4ZjJjODE4ZGI0MmJjMw==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
MjM3NTUzMmQ3NjBmZThjNWI2MDZkZmIzNTFhMDYwZGRmOWE1ZDAxNjFhMjE5
|
10
|
+
ZDA0MjQxNjJiNmNkZmIzYmYyYjE4ZGViNzMyMjMyNTZiYzA1NTc1ODBmMDFj
|
11
|
+
YjlmMmRkZWFhNTdjMDMzN2JlZGE0OTEwMjUyY2YyMTAxNjI5OTk=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
MzkzYWM3ODlkYjYzZDVkN2IwN2M3MTk5MGM5YzM1NzI4OTczNDlmMTE5OTlm
|
14
|
+
OGYxNDQ2YWVhZTViMjI2NzYxZDVjZjRjY2EyNTcyNTNlY2EwODk3M2M3M2Yx
|
15
|
+
NGYwMDA4MDQ5Yjk4ZmIxN2ZkNmZiODIxYjI3MTQ3M2Q4NTRiOTk=
|
data/Gemfile.lock
CHANGED
data/bin/hobo
CHANGED
@@ -3,17 +3,13 @@
|
|
3
3
|
# Hack to allow testing with Aruba (for now)
|
4
4
|
$:.push File.expand_path(File.join("..", "..", "lib"), __FILE__)
|
5
5
|
|
6
|
-
# Hack to override Gemfile to that of hobo (otherwise it'll use project specific one!)
|
7
|
-
ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
|
8
|
-
require 'hobo/patches/rubygems'
|
9
|
-
require 'bundler'
|
10
|
-
Bundler.setup(:default)
|
11
|
-
|
12
6
|
# Suppress Net/SSH/Simple warning on windows
|
7
|
+
# Note that $HOBO_ARGV is used as an indicator in the gemspec as to whether it needs to build a filelist
|
8
|
+
# Removing it or moving it after the bundler setup will cause "fatal: Not a git repository" errors
|
13
9
|
$SUPPRESS_32BIT_WARNING=1
|
14
|
-
|
15
10
|
$HOBO_ARGV = ARGV
|
16
11
|
|
12
|
+
require 'hobo/init/bundler_context'
|
17
13
|
require 'hobo'
|
18
14
|
|
19
15
|
# Default main classes
|
@@ -45,6 +41,7 @@ slop = Slop.parse! do
|
|
45
41
|
end
|
46
42
|
|
47
43
|
on '--non-interactive', 'Run non-interactively. Defaults will be automatically used where possible.'
|
44
|
+
on '--skip-host-checks', 'Skip host checks'
|
48
45
|
end
|
49
46
|
|
50
47
|
Hobo.logger.formatter = proc do |severity, datetime, progname, msg|
|
@@ -55,7 +52,7 @@ opts = slop.to_hash
|
|
55
52
|
Hobo.ui.interactive = !(opts[:'non-interactive'] == true)
|
56
53
|
|
57
54
|
begin
|
58
|
-
Hobo::Lib::HostCheck.check(:filter => /not_using_system_ruby/, :raise => true)
|
55
|
+
Hobo::Lib::HostCheck.check(:filter => /not_using_system_ruby/, :raise => true) unless opts[:'skip-host-checks']
|
59
56
|
Hobo.cli = Hobo::Cli.new(slop: slop)
|
60
57
|
Hobo.cli.start
|
61
58
|
rescue Exception => error
|
data/hobo.gemspec
CHANGED
@@ -13,7 +13,9 @@ Gem::Specification.new do |spec|
|
|
13
13
|
spec.summary = %q{Inviqan toolbelt}
|
14
14
|
spec.homepage = ""
|
15
15
|
|
16
|
-
|
16
|
+
# This file will get interpretted at runtime due to Bundler.setup
|
17
|
+
# Without the $HOBO_ARGV check (set in bin/hobo) fatal: not a git repository errors show up
|
18
|
+
spec.files = `git ls-files`.split($/) unless $HOBO_ARGV
|
17
19
|
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
|
18
20
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
19
21
|
spec.require_paths = ["lib"]
|
@@ -30,8 +32,12 @@ Gem::Specification.new do |spec|
|
|
30
32
|
spec.add_dependency "teerb", "~> 0.0.1"
|
31
33
|
spec.add_dependency "net-ssh-simple", "~> 1.6.3"
|
32
34
|
spec.add_dependency "pry", "~> 0.9.12"
|
35
|
+
|
36
|
+
# Not actually a dep! gem insists on installing 1.6.2.rc2 however!
|
33
37
|
spec.add_dependency "nokogiri", "= 1.6.1"
|
34
38
|
|
39
|
+
# This prevents Bundler.setup from complaining that rubygems did not install dev deps
|
40
|
+
# If you want to run dev deps you need to ensure HOBO_ENV=dev is set for bundle install & bundle exec
|
35
41
|
if ENV['HOBO_ENV'] == 'dev'
|
36
42
|
spec.add_development_dependency "aruba", "~> 0.5.4"
|
37
43
|
spec.add_development_dependency "rspec", "~> 2.14.1"
|
data/lib/hobo.rb
CHANGED
data/lib/hobo/cli.rb
CHANGED
@@ -69,7 +69,7 @@ module Hobo
|
|
69
69
|
return 0
|
70
70
|
end
|
71
71
|
|
72
|
-
#
|
72
|
+
# Display help and exit
|
73
73
|
# @param [Hash] Options to apss to help formatter.
|
74
74
|
# Options are mostly used for filtering
|
75
75
|
def show_help(opts = {})
|
@@ -125,7 +125,6 @@ module Hobo
|
|
125
125
|
def define_global_opts slop
|
126
126
|
slop.on '-a', '--all', 'Show hidden commands'
|
127
127
|
slop.on '-h', '--help', 'Display help'
|
128
|
-
slop.on '--skip-host-checks', 'Skip host checks'
|
129
128
|
|
130
129
|
slop.on '-v', '--version', 'Print version information' do
|
131
130
|
Hobo.ui.info "Hobo version #{Hobo::VERSION}"
|
@@ -0,0 +1,23 @@
|
|
1
|
+
# Hack to override Gemfile to that of hobo (otherwise it'll use project specific one!)
|
2
|
+
ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../../Gemfile', __FILE__)
|
3
|
+
|
4
|
+
require 'shellwords'
|
5
|
+
require 'hobo/version'
|
6
|
+
|
7
|
+
# gem install != bundle install
|
8
|
+
# Gem may well skip some deps that bundler wants
|
9
|
+
bundler_check = File.join(ENV['HOME'], '.hobo', 'bundler_check')
|
10
|
+
unless File.exists?(bundler_check) && File.read(bundler_check).strip == Hobo::VERSION
|
11
|
+
`bundle check --gemfile=#{ENV['BUNDLE_GEMFILE'].shellescape}`
|
12
|
+
unless $?.success?
|
13
|
+
puts "Hobo has detected missing dependencies. Please wait while they're installed"
|
14
|
+
`bundle install --gemfile=#{ENV['BUNDLE_GEMFILE'].shellescape}`
|
15
|
+
Kernel.exec('hobo', *$HOBO_ARGV)
|
16
|
+
end
|
17
|
+
File.write(bundler_check, Hobo::VERSION)
|
18
|
+
end
|
19
|
+
|
20
|
+
require 'hobo/patches/rubygems'
|
21
|
+
require 'bundler'
|
22
|
+
|
23
|
+
Bundler.setup(:default)
|
data/lib/hobo/lib/host_check.rb
CHANGED
@@ -6,7 +6,7 @@ module Hobo
|
|
6
6
|
begin
|
7
7
|
version = shell "vagrant --version", :capture => true
|
8
8
|
version.gsub!(/^Vagrant /, '')
|
9
|
-
version = ::Semantic::Version.new version
|
9
|
+
version = ::Semantic::Version.new version.strip
|
10
10
|
minimum_version = ::Semantic::Version.new "1.3.5"
|
11
11
|
|
12
12
|
advice = <<-EOF
|
data/lib/hobo/tasks/deps.rb
CHANGED
data/lib/hobo/tasks/vm.rb
CHANGED
data/lib/hobo/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: hobo-inviqa
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.10.pre.
|
4
|
+
version: 0.0.10.pre.rc10
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Mike Simons
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-04-
|
11
|
+
date: 2014-04-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: slop
|
@@ -233,6 +233,7 @@ files:
|
|
233
233
|
- lib/hobo/helper/http_download.rb
|
234
234
|
- lib/hobo/helper/shell.rb
|
235
235
|
- lib/hobo/helper/vm_command.rb
|
236
|
+
- lib/hobo/init/bundler_context.rb
|
236
237
|
- lib/hobo/lib/host_check.rb
|
237
238
|
- lib/hobo/lib/host_check/deps.rb
|
238
239
|
- lib/hobo/lib/host_check/git.rb
|