dockly 1.0.0 → 1.1.0

data/README.md

@@ -7,12 +7,16 @@ Dockly
 
 `dockly` is a gem made to ease the pain of packaging an application. For this gem to be useful, quite a few assumptions can be made about your stack:
 
-- You use AWS
 - You're deploying to a Debian-based system
 - You want to use [Docker](http://docker.io) for process isolation
 
 Although only a specific type of repository may be used, these assumptions allow us to define a simple DSL to describe your repository.
 
+Usage
+-----
+
+Once a `deb` block has been defined by the DSL below, dockly is invoked by either `bundle exec dockly build #{deb block name}` or `bundle exec rake dockly:deb:#{deb block name}`.
+
 The DSL
 -------
 
@@ -58,6 +62,8 @@ end
 `build_cache`
 -------------
 
+Optional
+
 The `build_cache` DSL is used to prevent rebuilding assets every build and used cached assets.
 
 - `s3_bucket`
@@ -137,6 +143,8 @@ Need finer control of Docker packages? We also wrote [docker-api](https://github
 `foreman`
 ---------
 
+Optional
+
 The `foreman` DSL is used to define the foreman export scripts. It has the following attributes:
 
 - `env`

data/dockly.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = %w{lib}
   gem.version       = Dockly::VERSION
   gem.add_dependency 'clamp', '~> 0.6'
-  gem.add_dependency 'docker-api', '~> 1.5.2'
+  gem.add_dependency 'docker-api', '~> 1.6.0'
   gem.add_dependency 'dockly-util', '~> 0.0.5'
   gem.add_dependency 'excon'
   gem.add_dependency 'fog', '~> 1.18.0'

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/dockly/deb_spec.rb

@@ -59,7 +59,7 @@ describe Dockly::Deb do
       it 'builds the docker image and adds it to the deb' do
         subject.create_package!
         `dpkg --contents #{filename}`
-            .lines.grep(/dockly-deb_test-image\.tgz/).should_not be_empty
+            .lines.grep(/deb_test-image\.tgz/).should_not be_empty
       end
     end
 

data/spec/dockly/docker_spec.rb

@@ -85,7 +85,6 @@ describe Dockly::Docker do
       image = subject.build_image(image)
       container = Docker::Container.create('Image' => image.id, 'Cmd' => ['ls', '-1', '/'])
       output = container.tap(&:start).attach(:stream => true, :stdout => true, :stderr => true)
-      puts "output: #{output}"
       output.lines.grep(/lol/).should_not be_empty
       # TODO: stop resetting the connection, once no longer necessary after attach
       Docker.reset_connection!
@@ -93,7 +92,7 @@ describe Dockly::Docker do
 
       # it 'exports'
       subject.export_image(image)
-      File.exist?('build/docker/dockly-my-app-image.tgz').should be_true
+      File.exist?('build/docker/test_docker-image.tgz').should be_true
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: dockly-util
   requirement: !ruby/object:Gem::Requirement