containerci 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1025350f5ade0b3f3633886d3b40ccc106e318b
-  data.tar.gz: eed3c83efed695dc720bc0f992fe93b43835a275
+  metadata.gz: a41aa50a9da170e65dfb6e703f7d709cec774672
+  data.tar.gz: 0dada086c62e9cd1ce58a78f53f4a6257632e2e8
 SHA512:
-  metadata.gz: aec05edaee588f68c76697744ff9b27e908d2dec5a1ccac6a67094903e4446a16c3182e1db21f3901f886ea1b06adb32886e98937d80696996b9a1e56d2e8175
-  data.tar.gz: dfcef96634ded8ea6ace7a9c85873b49303f060d51c39204d46e904d86c5190013ed35a07d56b7e2e479482cd50c8c6f15b63dc12504e61cb2a5e5415023b00d
+  metadata.gz: 2967a89191b721f449047f906f0be39021103b8524c8911f206ddf34bfc524ebffab7fbde71ca9cd3931ce4929438820af71df7fbd7f6176e2b03e5405b3e13b
+  data.tar.gz: a8c0890daa5b8d5d588711dfa49b7fd96a687f4e0535d4de77df5ff97980f5571a2f54ec004aaf25b086928427867f10ee03cbac50a73dc4df2d95520f1a58cc

data/ChangeLog.md

@@ -0,0 +1,3 @@
+## Changes since ContainerCI 0.1.0
+
+### Add additional auditing of git checkouts

data/README.md

@@ -1,16 +1,19 @@
 # ContainerCI
 
-This is a toolkit for creating automated builds for Docker containers.
+This is a toolkit for creating automated builds for Docker containers via the magic of Rakefiles.
 
-It currently supports a limited workflow for a container in CircleCI
-(i.e., something I needed to do twice),  but contributions are welcome!
+It will pull from a given tag from the project which you are containerizing, use Docker and your Dockerfile to build, run tests that you define, and push to DockerHub.
+
+With the below sample circle.yml, you can use CircleCI to automate this process and build your container whenever your source project changes and passes its tests.
+
+ContainerCI currently supports a pretty limited workflow for a container in CircleCI (i.e., something I needed to do twice), but contributions are welcome!
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'container-ci'
+gem 'containerci'
 ```
 
 And then execute:
@@ -19,14 +22,84 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install container-ci
+    $ gem install containerci
 
 ## Usage
 
-Add this line to your applicatoin's Rakefile:
+1) Add this line to your application's Rakefile:
+
+```ruby
+require 'containerci'
+
+ContainerCI::ExportGithubProjectIntoContainer.new
+```
+
+2) Create a circle.yml file that looks like this:
+
+
+```yaml
+machine:
+ services:
+   - docker
+ post:
+   - 'echo "{ \"https://index.docker.io/v1/\": { \"auth\": \"$DOCKERHUB_TOKEN\", \"email\": \"$DOCKERHUB_EMAIL\" }}" > ~/.dockercfg'
+dependencies:
+  cache_directories:
+    - "sinatra-vld"
+    - "~/docker"
+    - "~/docker-machine"
+  post:
+    - bundle exec rake dependencies
+test:
+  override:
+    - bundle exec rake test quality
+deployment:
+  staging:
+    branch: master
+    commands:
+      - bundle exec rake after_test_success
+```
+
+3) Define tasks for :deploy (or change/remove the deployment section of the below
+circleci.yml file).
+
+4) Define a task for :test to test your container before it is tagged and
+pushed to Docker Hub.
+
+5) Verify it works.
+
+6) Set up a trigger to build your container project when the source project succesfully builds (see below). 
+
+## Setting up CircleCI automated build triggers
+
+When your source project succesfully builds and passes tests, you're going to want to rebuild the container with the resulting files.  Add this to your source project (not the one you're using this gem with!):
+
+```yaml
+deployment:
+  staging:
+    branch: master
+    commands:
+      - bundle exec rake after_test_success
+```
+
+Now add these tasks to your Rakefile:
 
 ```ruby
-require 'container-ci'
+# this is run by CircleCI
+task after_test_success: [:tag, :trigger_next_builds]
+
+task :tag do
+  sh 'git tag -f tests_passed'
+  sh 'git push -f origin tests_passed'
+end
+
+GITHUB_USER = 'you'
+DOWNSTREAM_GITHUB_PROJECT = 'your-container-project'
+
+task :trigger_next_builds do
+  sh "curl -v -X POST https://circleci.com/api/v1/project/#{GITHUB_USER}/" \
+     "#{DOWNSTREAM_GITHUB_PROJECT}/tree/master?circle-token=$CIRCLE_TOKEN"
+end
 ```
 
 ## Development
@@ -44,7 +117,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/container-ci. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/apiology/containerci. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
 
 ## License

data/Rakefile

@@ -1,4 +1,4 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'quality/rake/task'
 

data/containerci.gemspec

@@ -5,7 +5,7 @@ require 'containerci/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "containerci"
-  spec.version       = Containerci::VERSION
+  spec.version       = ContainerCI::VERSION
   spec.authors       = ["Vince Broz"]
   spec.email         = ["vince@broz.cc"]
 

data/coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 100.0
+    "covered_percent": 23.64
   }
 }

data/lib/containerci.rb

@@ -1,5 +1,8 @@
-require "containerci/version"
+require 'rake'
+require 'rake/tasklib'
+require 'containerci/version'
 
+# Rakefile toolkit for creating automated builds for Docker containers.
 module ContainerCI
   #
   # Exports a github project into a container--set up so that CI systems
@@ -31,16 +34,16 @@ module ContainerCI
     end
 
     def define
-      # XXX: Document circleci.yml
       @dsl.define_task(:update_github_project) do
         puts "pulling #{GITHUB_PROJECT}..."
-        if Dir.exist? GITHUB_PROJECT
-          sh "cd #{GITHUB_PROJECT} && git pull origin tests_passed"
-        else
+        unless Dir.exist? GITHUB_PROJECT
           sh 'git clone https://$GITHUB_OAUTH:x-oauth-basic@' \
              "github.com/#{USER}/#{GITHUB_PROJECT}.git"
         end
+        sh "cd #{GITHUB_PROJECT} && git pull origin tests_passed"
+        sh "cd #{GITHUB_PROJECT} && git show-ref --tags"
         sh "cd #{GITHUB_PROJECT} && git checkout tests_passed"
+        sh "cd #{GITHUB_PROJECT} && git rev-parse HEAD"
         puts 'done'
       end
 
@@ -54,9 +57,6 @@ module ContainerCI
         puts 'done'
       end
 
-      # XXX: Why do we have to pull all images here, just to figure out what
-      # the latest version is?  Wish we could just pull latest.
-
       @dsl.define_task(:raw_docker_pull) do
         puts 'Pulling from dockerhub...'
         sh 'false; ' \
@@ -90,7 +90,9 @@ module ContainerCI
                          [:restore_cache, :raw_docker_pull, :save_new_cache])
 
       @dsl.define_task(dependencies:
-                         [:update_github_project, :docker_pull, :get_docker_machine])
+                         [:update_github_project,
+                          :docker_pull,
+                          :get_docker_machine])
 
       @dsl.define_task(:print_next_version) do
         puts "next version is #{next_version}"
@@ -110,37 +112,17 @@ module ContainerCI
                           :docker_build_next_version,
                           :docker_tag])
 
-      @dsl.define_task(test:
-                         [:build,
-                          # :start_container, :verify_listening_on_port, :stop_container
-                         ])
+      @dsl.define_task(test: [:build])
 
       @dsl.define_task(:docker_push) do
         sh "docker push #{USER}/#{PROJECT_NAME}"
         sh "docker push #{USER}/#{PROJECT_NAME}:#{current_version}"
       end
 
-      @dsl.define_task(:manual_deploy) do
-        sh "in-sinatra-vld-prod docker pull #{USER}/#{PROJECT_NAME}:latest"
-        sh 'in-sinatra-vld-prod docker ps'
-        sh 'in-sinatra-vld-prod docker kill `in-sinatra-vld-prod docker ps -l -q`'
-        sh 'in-sinatra-vld-prod docker run -d -P -p 0.0.0.0:4567:4567 ' \
-           "-v /root/private:/root/private #{USER}/#{PROJECT_NAME}"
-        sh 'in-sinatra-vld-prod docker ' \
-           'exec -it `in-sinatra-vld-prod docker ps -l -q` /bin/dropbox ' \
-           'status'
-        puts "After connected, hit Control-C and run 'rake wait_for_dropbox'"
-        sh 'in-sinatra-vld-prod docker exec -it ' \
-           '`in-sinatra-vld-prod docker ps -l -q` ' \
-           'tail -f /var/log/dropbox/dropbox.log'
-      end
-
       @dsl.define_task(after_test_success:
                          [:docker_push,
-                          #:deploy_to_prod
+                          :deploy
                          ])
     end
-    # XXX: As configured in CircleCI, this runs regardless of whether test passed
-
   end
 end

data/lib/containerci/version.rb

@@ -1,3 +1,4 @@
-module Containerci
-  VERSION = "0.1.0"
+# Rakefile toolkit for creating automated builds for Docker containers.
+module ContainerCI
+  VERSION = '0.2.0'
 end

data/metrics/bigfiles_high_water_mark

@@ -1 +1 @@
-81
+188

data/metrics/cane_high_water_mark

@@ -1 +1 @@
-0
+1

data/metrics/rubocop_high_water_mark

@@ -1 +1 @@
-4
+2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: containerci
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Vince Broz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,6 +65,7 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
+- ChangeLog.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt