building 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2edfe6caacb030124aec94fd0875516f4de2907f
-  data.tar.gz: 7b945e7cf653c8f8f9b522f0fe72e641e82cb498
+  metadata.gz: 3744e78cd0ca432f9d2fda9ecb230627a264f96f
+  data.tar.gz: 2c29701e06a4767e68521b8a5a6caba511b7a289
 SHA512:
-  metadata.gz: 3e6f7b9300342d0535cdbf068085e575cbd1789f18794890a334363d2361f4d821083967a0e32207c58753e6ed138d46ef8fa7a0b89afaf53d13b832fafcdee0
-  data.tar.gz: 5d09dc19ad2a6592ef4759b6e69c88d81b476ca1a8eec521ca6e741bb6e4b984616d58408e9abaebe8865293a9e01feaba7c2429a6a48298a92f59762299e824
+  metadata.gz: aaaab250877fe69b264a65ff26f0b1506d04b812fead145b4734203353d4fa8bfba31bce34bf6ac1edac0594ee1b953ec6621dfb9271976f3eafbf3030818fe5
+  data.tar.gz: 8ac316c49e0fe3b3c49956a47d6818106f05fd6a2467fd95b747e2caeb7996f91c37e6e140e074050ef01d051a70f71e5442398dcc7f2e4f98e281949951f963

data/lib/building.rb

@@ -1,5 +1,7 @@
 require 'yaml'
 require 'fileutils'
+require 'bundler/setup' 
+require 'highline/import'
 
 class Building
   def self.convert(app_name, tag, options={})
@@ -19,57 +21,71 @@ class Building
     create_dockerfile
     build_container
 
+    build_fig if @fig
+
     if @port
       run_container(@port)
     else
       explain_container(8080)
     end
 
-    if @fig
-      build_fig
-    end
-
     exit 0
   end
 
   def create_dockerfile
-    File.open("Dockerfile" , "w") do |file|
-      file << "FROM #{@from || "ctlc/buildstep:ubuntu13.10"}\n"
-    end
+    dockerfile = []
+    dockerfile << "FROM #{@from || "ctlc/buildstep:ubuntu13.10"}\n"
 
     if @buildpack_url
-      File.open("Dockerfile" , "a") do |file|
-        file << <<-eof
+      dockerfile << <<-eof
 RUN git clone --depth 1 #{@buildpack_url} /build/buildpacks/#{@buildpack_url.split("/").last.sub(".git","")}
 RUN echo #{@buildpack_url} >> /build/buildpacks.txt
 eof
-      end
     end
 
     if @includes
-      File.open("Dockerfile" , "a") do |file|
-        file << "RUN #{@includes}\n"
-      end
+      dockerfile << "RUN #{@includes}\n"
     end
 
     if @file
-      File.open("Dockerfile" , "a") do |file|
-        file << IO.read(@file)
-      end
+      dockerfile << IO.read(@file)
     end
 
-    File.open("Dockerfile" , "a") do |file|
-      file << <<-eof
+    dockerfile << <<-eof
 ADD . /app
 RUN /build/builder
 CMD /start web
 eof
+    
+    skip = false
+
+    if File.exists?("Dockerfile")
+      if IO.read("Dockerfile") == dockerfile.join("\n")
+        skip = true
+        say %{   <%= color('identical', [BLUE, BOLD]) %>  Dockerfile}
+      else
+        say %{    <%= color('conflict', [RED, BOLD]) %>  Dockerfile}
+        choice = ask("Overwrite Dockerfile? [Yn] ")
+        if choice.downcase == "n"
+          say("Aborting...")
+          exit 1
+        else
+          say %{       <%= color('force', [YELLOW, BOLD]) %>  Dockerfile}
+        end
+      end
+    else
+      say %{      <%= color('create', [GREEN, BOLD]) %>  Dockerfile}
+    end
+
+    if !skip
+      File.open("Dockerfile" , "w") do |file|
+        file << dockerfile.join("\n")
+      end
     end
   end
 
   def build_fig
-    File.open(@fig , "w") do |file|
-      file << <<-eof
+    figfile = <<-eof
 web:
   image: #{@app_name}:#{@tag}
   command: /start web
@@ -78,22 +94,52 @@ web:
   ports:
    - #{@port || 8080}
 eof
+
+    skip = false
+    
+    if File.exists?(@fig)
+      if IO.read(@fig) == figfile
+        skip = true
+        say %{   <%= color('identical', [BLUE, BOLD]) %>  #{@fig}}
+      else
+        say %{    <%= color('conflict', [RED, BOLD]) %>  #{@fig}}
+        choice = ask("Overwrite #{File.expand_path(@fig)}? [Yn] ")
+        if choice.downcase == "n"
+          say("Aborting...")
+          exit 1
+        else
+          say %{       <%= color('force', [YELLOW, BOLD]) %>  #{@fig}}
+        end
+      end
+    else
+      say %{      <%= color('create', [GREEN, BOLD]) %>  #{@fig}}
+    end
+
+    if !skip
+      File.open(@fig , "w") do |file|
+        file << figfile
+      end
     end
   end
 
   def build_container
-    pid = fork { exec "docker build -t #{@app_name}:#{@tag} ." }
+    build_cmd = "docker build -t #{@app_name}:#{@tag} ."
+    say %{    <%= color('building', [BLUE, BOLD]) %>  #{build_cmd}}
+    pid = fork { exec build_cmd }
     Process.waitpid(pid)
   end
 
   def explain_container(port)
     run = "docker run -d -p #{port} -e \"PORT=#{port}\" #{@app_name}:#{@tag}"
-    puts "\nTo run your app, try something like this:\n\n\t#{run}\n\n"
+    rebuild = "docker build -t #{@app_name} ."
+
+    say "        <%= color('hint', [YELLOW, BOLD]) %>       To run your app, try:  <%= color('#{run}', [BOLD]) %>"
+    say "        <%= color('hint', [YELLOW, BOLD]) %>  To re-build your app, try:  <%= color('#{rebuild}', [BOLD]) %>"
   end
 
   def run_container(port)
-    run = "\ndocker run -d -p #{port} -e \"PORT=#{port}\" #{@app_name}:#{@tag}"
-    puts "#{run}"
+    run = "docker run -d -p #{port} -e \"PORT=#{port}\" #{@app_name}:#{@tag}"
+    say "     <%= color('running', [BLUE, BOLD]) %>  #{run}"
     exec run
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: building
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Lucas Carlson
@@ -17,8 +17,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/building
 - lib/building.rb
+- bin/building
 homepage: http://github.com/CenturyLinkLabs/building
 licenses:
 - MIT
@@ -29,18 +29,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - bundler
+- highline
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Build a Docker container for any app using Heroku Buildpacks