tid 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb734390a35364f1e6ca0ca85c8f3877dcc09cc4
-  data.tar.gz: 4a5aaee11bab1e364c558db56eb2e2cbc3c54ac4
+  metadata.gz: d8752a47d6a93f54cb6b2725b60417c73aec97de
+  data.tar.gz: 6c404ae01d26850f0e81d082673478fe11a5081e
 SHA512:
-  metadata.gz: ce623229ef7feab8984379543cd6d2e3a7bfd440658bd4d92b2bd16388388669382ce62f58c197723f1e369c0fc00dda0d99e97115eaa6d402a34e5083d00e22
-  data.tar.gz: 340ca41f9b70a0e5ef3df7b3bea469338520f1aafc753556c7bd0adcc3a241517cc391677048c067384e2797045ed19a8e1adc56da2963293f3132db6947a983
+  metadata.gz: efecb173ce0896b65a5597af1c507b753ec5531a7e61bf5827802555281729ae93ecd96b9e7373db7e50e84440d16cd2d62949a85139bd7ae7fb4aa69df44e05
+  data.tar.gz: a4343c13d3db83f3276282135be48a06f803fd6d269523748085e941f4d65b7e8a22d9007adea9ee1161c57498437b5e87b5e2caec8a620542f3cabf3005b60a

data/README.md

@@ -4,7 +4,7 @@ TID
 Easy to test in the docker container.
 
 [![ruby gem](https://img.shields.io/gem/v/tid.svg?style=flat-square)][gem]
-[![wercker status](https://img.shields.io/wercker/ci/f6e5ba503e4a1f062c6b012ff77d87d0.svg?style=flat-square)][wercker]
+[![wercker status](https://img.shields.io/wercker/ci/54e28c8577795a6f61078b9e.svg?style=flat-square)][wercker]
 
 [gem]: https://rubygems.org/gems/tid
 [wercker]: https://app.wercker.com/project/bykey/f6e5ba503e4a1f062c6b012ff77d87d0

data/lib/tid.rb

@@ -13,7 +13,7 @@ module Tid
       Boot2docker.prepare if Boot2docker.have?
       Docker.build
       Docker.run
-      self.set_env
+      self.env!
     end
 
     def clear
@@ -25,8 +25,7 @@ module Tid
     def bundle(options = [])
       default_options = [
         '--gemfile',
-        "#{base_path}/Gemfile",
-        '--quiet'
+        "#{base_path}/Gemfile"
       ]
 
       Bundler.with_clean_env do
@@ -38,9 +37,19 @@ module Tid
       ENV['TID_BASE_PATH'] ||= './spec/tid'
     end
 
-    def set_env
-      ENV['TID_HOSTNAME'] ||= "#{Docker.hostname}"
-      ENV['TID_PORT'] ||= "#{Docker.container_ssh_port}"
+    def env
+      @env
+    end
+
+    def env!
+      ENV['TID_HOSTNAME'] = h = Docker.hostname
+      ENV['TID_PORT'] = p = Docker.container_ssh_port
+
+      @env = {
+        'TID_HOSTNAME' => h,
+        'TID_PORT' => p,
+        'TID_BASE_PATH' => base_path
+      }
     end
   end
 end

data/lib/tid/console.rb

@@ -5,13 +5,20 @@ module Tid
   module Console
     class << self
       def default_env
-        Boot2docker.have? ? Boot2docker.env : {}
+        env = if Boot2docker.have?
+            Boot2docker.env
+          else
+            {}
+          end
+        env.merge!(Tid.env) unless Tid.env.nil?
+        env
       end
 
       def cmd(str, env = {})
         env = default_env.merge(env)
+        show_cmd(str, env) if debug?
         out, err, status = Open3.capture3(env, str)
-        show_debuggings(str, env, out, err, status) if debug?
+        show_cmd_result(out, err, status) if debug?
         return out, err, status
       end
 
@@ -19,10 +26,15 @@ module Tid
         !!ENV['DEBUG']
       end
 
-      def show_debuggings(str, env, out, err, status)
-        puts "  $ #{str} (exit: #{status.exitstatus})".color(:blue)
-        puts "#{out}".gsub(/^(.*)/, '    \1').color(:green) unless out.empty?
-        puts "#{err}".gsub(/^(.*)/, '    \1').color(:red) unless err.empty?
+      def show_cmd(str, env)
+        puts "\n  # #{str}".color(:blue)
+        env.each { |k,v| puts "    ENV['#{k}'] = #{v}" }
+      end
+
+      def show_cmd_result(out, err, status)
+        puts "#{out}".chomp.gsub(/^(.*)/, '    \1').color(:green) unless out.empty?
+        puts "#{err}".chomp.gsub(/^(.*)/, '    \1').color(:red) unless err.empty?
+        puts "    exit status: #{status.exitstatus}".color(:yellow)
       end
     end
   end

data/lib/tid/version.rb

@@ -1,3 +1,3 @@
 module Tid
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/tid_spec.rb

@@ -5,6 +5,8 @@ RSpec.describe 'Tid' do
         "ssh root@#{ENV['TID_HOSTNAME']}",
         "-p #{ENV['TID_PORT']}",
         "-i #{ENV['TID_BASE_PATH']}/id_rsa",
+        "-o StrictHostKeyChecking=no",
+        "-o UserKnownHostsFile=/dev/null",
         "'echo yo'"
       ].join(' ')
     end

data/tid.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'rainbow', '~> 2.0.0'
-  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'bundler', '> 1.3'
   spec.add_development_dependency 'rake', '~> 10.0'
 end

data/wercker.yml

@@ -1,15 +1,18 @@
 box: wercker-labs/docker
 build:
-  steps:
-    - install-packages:
-      packages: build-essential ruby2.0 ruby2.0-dev bundler
-    - script:
-        name: install latest docker
-        code: |
-          docker version
-          curl -s http://get.docker.io/ubuntu/ | sudo sh
-          docker version
-    - bundle-install
-    - script:
-       name: rspec
-       code: bundle exec rspec
+    steps:
+        - install-packages:
+            packages: build-essential ruby2.0 ruby2.0-dev bundler
+        - script:
+            name: install latest docker
+            code: |
+              docker version
+              curl -s http://get.docker.io/ubuntu/ | sudo sh
+              docker version
+        - script:
+            name: chmod private key
+            code: chmod 600 ./spec/tid/id_rsa
+        - bundle-install
+        - script:
+             name: rspec
+             code: bundle exec rspec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tid
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - linyows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement