tid 0.0.1 → 0.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: eb734390a35364f1e6ca0ca85c8f3877dcc09cc4
4
- data.tar.gz: 4a5aaee11bab1e364c558db56eb2e2cbc3c54ac4
3
+ metadata.gz: d8752a47d6a93f54cb6b2725b60417c73aec97de
4
+ data.tar.gz: 6c404ae01d26850f0e81d082673478fe11a5081e
5
5
  SHA512:
6
- metadata.gz: ce623229ef7feab8984379543cd6d2e3a7bfd440658bd4d92b2bd16388388669382ce62f58c197723f1e369c0fc00dda0d99e97115eaa6d402a34e5083d00e22
7
- data.tar.gz: 340ca41f9b70a0e5ef3df7b3bea469338520f1aafc753556c7bd0adcc3a241517cc391677048c067384e2797045ed19a8e1adc56da2963293f3132db6947a983
6
+ metadata.gz: efecb173ce0896b65a5597af1c507b753ec5531a7e61bf5827802555281729ae93ecd96b9e7373db7e50e84440d16cd2d62949a85139bd7ae7fb4aa69df44e05
7
+ data.tar.gz: a4343c13d3db83f3276282135be48a06f803fd6d269523748085e941f4d65b7e8a22d9007adea9ee1161c57498437b5e87b5e2caec8a620542f3cabf3005b60a
data/README.md CHANGED
@@ -4,7 +4,7 @@ TID
4
4
  Easy to test in the docker container.
5
5
 
6
6
  [![ruby gem](https://img.shields.io/gem/v/tid.svg?style=flat-square)][gem]
7
- [![wercker status](https://img.shields.io/wercker/ci/f6e5ba503e4a1f062c6b012ff77d87d0.svg?style=flat-square)][wercker]
7
+ [![wercker status](https://img.shields.io/wercker/ci/54e28c8577795a6f61078b9e.svg?style=flat-square)][wercker]
8
8
 
9
9
  [gem]: https://rubygems.org/gems/tid
10
10
  [wercker]: https://app.wercker.com/project/bykey/f6e5ba503e4a1f062c6b012ff77d87d0
data/lib/tid.rb CHANGED
@@ -13,7 +13,7 @@ module Tid
13
13
  Boot2docker.prepare if Boot2docker.have?
14
14
  Docker.build
15
15
  Docker.run
16
- self.set_env
16
+ self.env!
17
17
  end
18
18
 
19
19
  def clear
@@ -25,8 +25,7 @@ module Tid
25
25
  def bundle(options = [])
26
26
  default_options = [
27
27
  '--gemfile',
28
- "#{base_path}/Gemfile",
29
- '--quiet'
28
+ "#{base_path}/Gemfile"
30
29
  ]
31
30
 
32
31
  Bundler.with_clean_env do
@@ -38,9 +37,19 @@ module Tid
38
37
  ENV['TID_BASE_PATH'] ||= './spec/tid'
39
38
  end
40
39
 
41
- def set_env
42
- ENV['TID_HOSTNAME'] ||= "#{Docker.hostname}"
43
- ENV['TID_PORT'] ||= "#{Docker.container_ssh_port}"
40
+ def env
41
+ @env
42
+ end
43
+
44
+ def env!
45
+ ENV['TID_HOSTNAME'] = h = Docker.hostname
46
+ ENV['TID_PORT'] = p = Docker.container_ssh_port
47
+
48
+ @env = {
49
+ 'TID_HOSTNAME' => h,
50
+ 'TID_PORT' => p,
51
+ 'TID_BASE_PATH' => base_path
52
+ }
44
53
  end
45
54
  end
46
55
  end
data/lib/tid/console.rb CHANGED
@@ -5,13 +5,20 @@ module Tid
5
5
  module Console
6
6
  class << self
7
7
  def default_env
8
- Boot2docker.have? ? Boot2docker.env : {}
8
+ env = if Boot2docker.have?
9
+ Boot2docker.env
10
+ else
11
+ {}
12
+ end
13
+ env.merge!(Tid.env) unless Tid.env.nil?
14
+ env
9
15
  end
10
16
 
11
17
  def cmd(str, env = {})
12
18
  env = default_env.merge(env)
19
+ show_cmd(str, env) if debug?
13
20
  out, err, status = Open3.capture3(env, str)
14
- show_debuggings(str, env, out, err, status) if debug?
21
+ show_cmd_result(out, err, status) if debug?
15
22
  return out, err, status
16
23
  end
17
24
 
@@ -19,10 +26,15 @@ module Tid
19
26
  !!ENV['DEBUG']
20
27
  end
21
28
 
22
- def show_debuggings(str, env, out, err, status)
23
- puts " $ #{str} (exit: #{status.exitstatus})".color(:blue)
24
- puts "#{out}".gsub(/^(.*)/, ' \1').color(:green) unless out.empty?
25
- puts "#{err}".gsub(/^(.*)/, ' \1').color(:red) unless err.empty?
29
+ def show_cmd(str, env)
30
+ puts "\n # #{str}".color(:blue)
31
+ env.each { |k,v| puts " ENV['#{k}'] = #{v}" }
32
+ end
33
+
34
+ def show_cmd_result(out, err, status)
35
+ puts "#{out}".chomp.gsub(/^(.*)/, ' \1').color(:green) unless out.empty?
36
+ puts "#{err}".chomp.gsub(/^(.*)/, ' \1').color(:red) unless err.empty?
37
+ puts " exit status: #{status.exitstatus}".color(:yellow)
26
38
  end
27
39
  end
28
40
  end
data/lib/tid/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Tid
2
- VERSION = '0.0.1'
2
+ VERSION = '0.0.2'
3
3
  end
data/spec/tid_spec.rb CHANGED
@@ -5,6 +5,8 @@ RSpec.describe 'Tid' do
5
5
  "ssh root@#{ENV['TID_HOSTNAME']}",
6
6
  "-p #{ENV['TID_PORT']}",
7
7
  "-i #{ENV['TID_BASE_PATH']}/id_rsa",
8
+ "-o StrictHostKeyChecking=no",
9
+ "-o UserKnownHostsFile=/dev/null",
8
10
  "'echo yo'"
9
11
  ].join(' ')
10
12
  end
data/tid.gemspec CHANGED
@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
19
19
  spec.require_paths = ['lib']
20
20
 
21
21
  spec.add_dependency 'rainbow', '~> 2.0.0'
22
- spec.add_development_dependency 'bundler', '~> 1.7'
22
+ spec.add_development_dependency 'bundler', '> 1.3'
23
23
  spec.add_development_dependency 'rake', '~> 10.0'
24
24
  end
data/wercker.yml CHANGED
@@ -1,15 +1,18 @@
1
1
  box: wercker-labs/docker
2
2
  build:
3
- steps:
4
- - install-packages:
5
- packages: build-essential ruby2.0 ruby2.0-dev bundler
6
- - script:
7
- name: install latest docker
8
- code: |
9
- docker version
10
- curl -s http://get.docker.io/ubuntu/ | sudo sh
11
- docker version
12
- - bundle-install
13
- - script:
14
- name: rspec
15
- code: bundle exec rspec
3
+ steps:
4
+ - install-packages:
5
+ packages: build-essential ruby2.0 ruby2.0-dev bundler
6
+ - script:
7
+ name: install latest docker
8
+ code: |
9
+ docker version
10
+ curl -s http://get.docker.io/ubuntu/ | sudo sh
11
+ docker version
12
+ - script:
13
+ name: chmod private key
14
+ code: chmod 600 ./spec/tid/id_rsa
15
+ - bundle-install
16
+ - script:
17
+ name: rspec
18
+ code: bundle exec rspec
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tid
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.1
4
+ version: 0.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - linyows
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-02-17 00:00:00.000000000 Z
11
+ date: 2015-02-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rainbow
@@ -28,16 +28,16 @@ dependencies:
28
28
  name: bundler
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ">"
32
32
  - !ruby/object:Gem::Version
33
- version: '1.7'
33
+ version: '1.3'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ">"
39
39
  - !ruby/object:Gem::Version
40
- version: '1.7'
40
+ version: '1.3'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rake
43
43
  requirement: !ruby/object:Gem::Requirement