freighter 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8295dacb935aa96503b1e287db0ad5bfb1d49545
-  data.tar.gz: 22499c6310016cae6382180d39f3a1469155a90e
+  metadata.gz: 092ef2407088b7808a5c4f99882ba9ffd20acfe7
+  data.tar.gz: a0bdad1daf34a8489128e7cd0b9a583d798d5fe1
 SHA512:
-  metadata.gz: cba0a378011e59479b5324f0fd23826f9fa3ed6b0183ea105ca3d4e14da0aeb9d3e88c9cd59d5c59bde380fb137c0863b622e4f5931a48c66b063eeae6a8d11f
-  data.tar.gz: 1a8327c1c358cb05cccb18316e32c5b13055de192113d0b4b311ddd26bc55f1786a680b8746f5b835fa21954842925b1ad5f3c3fd87587108d9ecb1f8c6d0379
+  metadata.gz: 4c4a1e8ee406b4c00ad2238691fe6b5e57394d05b1d7145cee93ea3b30ef195f65fe88c00fd65cc8f4e75348c84f4dd0ff29380f1adcd1105996b3cb6ba76605
+  data.tar.gz: 04272a1762fb6d356e0c71a4cfab236de3e2401271e66eb7a04f21672ce686d9bf12258d554e41c174ead6cb1dc800b3e94b6367169377b6209d88828ef51036

data/README.md

@@ -62,7 +62,7 @@ freighter --help
 
 Example of how to deploy:
 ```
-freighter -e staging --all deloy
+freighter -e staging --all deploy
 ```
 
 If you want to deploy one app:

data/config/freighter.example.yml

@@ -31,27 +31,30 @@ environments:
     shared_env: &shared_app_env
       DB_USERNAME: fooBar
       DB_PASSWORD: My53cr37
+
+    one_image: &one_image
+      name: organization/imageName:latest
+      containers:
+        - name: app
+          port_mapping: 0.0.0.0:80->80
+          env:
+            <<: *shared_app_env
+            ADDITIONAL_VAR: someValue
+
+    some_other_image: &other_image
+      name: organization/otherImage:latest
+      containers:
+        - name: otherApp
+          port_mapping: 0.0.0.0:2000->80
+          env:
+            <<: *shared_app_env
+
     hosts:
       - host: prod1.example.com
         images:
-          - name: organization/imageName:latest
-            containers:
-              - name: app
-                port_mapping: 0.0.0.0:80->80
-                env:
-                  <<: *shared_app_env
-                  ADDITIONAL_VAR: someValue
-          - name: organization/otherImage:latest
-            containers:
-              - name: otherApp
-                port_mapping: 0.0.0.0:2000->80
-                env:
-                  <<: *shared_app_env
+          - *one_image
+          - *other_image
       - host: prod2.example.com
         images:
-          - name: organization/imageName:latest
-            containers:
-              - name: otherApp
-                port_mapping: 0.0.0.0:2000->80
-                env:
-                  <<: *shared_app_env
+          - *one_image
+          - *other_image

data/freighter.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Freighter::VERSION
   spec.authors       = ["Sean McCleary"]
   spec.email         = ["seanmcc@gmail.com"]
-  spec.summary       = %q{Ruby gem to deploy docker containers}
-  spec.description   = %q{Ruby gem to deploy docker containers}
+  spec.summary       = %q{Easily deploy docker containers via SSH}
+  spec.description   = %q{Easily deploy docker containers via SSH}
   spec.homepage      = "https://github.com/mrinterweb/freighter"
   spec.license       = "MIT"
 
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "net-ssh", "~> 2.9"
-  spec.add_dependency "docker-api", "~> 1.14"
+  spec.add_dependency "docker-api", "1.20"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/freighter/deploy.rb

@@ -4,7 +4,7 @@ require 'thwait'
 
 module Freighter
   class Deploy
-    attr_reader :logger, :config 
+    attr_reader :logger, :config
 
     def initialize
       @parser = Parser.new OPTIONS.config_path
@@ -113,6 +113,7 @@ module Freighter
       # Sets up the Docker gem by setting the local URL and authenticating to the host's REST API
       def setup_docker_client(local_port)
         Docker.url = "http://localhost:#{local_port}"
+        Docker.connection.options[:scheme] = 'http'
         begin
           logger.debug "Requesting docker version"
           response = Docker.version
@@ -121,7 +122,9 @@ module Freighter
           response = Docker.authenticate!('username' => ENV['DOCKER_HUB_USER_NAME'], 'password' => ENV['DOCKER_HUB_PASSWORD'], 'email' => ENV['DOCKER_HUB_EMAIL'])
           logger.debug "Docker authentication: #{response.inspect}"
         rescue Excon::Errors::SocketError => e
-          logger.error e.message
+          abort e.message
+        rescue Exception => e
+          abort e.message
         end
       end
 

data/lib/freighter/version.rb

@@ -1,3 +1,3 @@
 module Freighter
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/lib/freighter/deploy_spec.rb

@@ -16,7 +16,7 @@ describe Freighter::Deploy do
 
       it "should match port mapping with IP address" do
         mapping = "0.0.0.0:80->90"
-        port_map = subject.send(:ports, mapping)
+        port_map = subject.send(:map_ports, mapping)
         expect(port_map.ip).to eq "0.0.0.0"
         expect(port_map.host).to eq 80
         expect(port_map.container).to eq 90
@@ -24,7 +24,7 @@ describe Freighter::Deploy do
 
       it "should be able to accept a mapping without an IP address" do
         mapping = "80->90"
-        port_map = subject.send(:ports, mapping)
+        port_map = subject.send(:map_ports, mapping)
         expect(port_map.ip).to be_nil
         expect(port_map.host).to eq 80
         expect(port_map.container).to eq 90

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freighter
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Sean McCleary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -28,16 +28,16 @@ dependencies:
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.20'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-description: Ruby gem to deploy docker containers
+description: Easily deploy docker containers via SSH
 email:
 - seanmcc@gmail.com
 executables:
@@ -156,11 +156,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: Ruby gem to deploy docker containers
+summary: Easily deploy docker containers via SSH
 test_files:
 - spec/lib/freighter/deploy_spec.rb
 - spec/lib/freighter/parser_spec.rb
 - spec/spec_helper.rb
+has_rdoc: