bricky 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTQ2ODNjMDgwNWViODIxN2I3ZGM4ZWRlNjhhNDc0ZGJhYjA2YzY3Zg==
+    OTk2Mjc3MWI3NGNhYTQwOGY5MDMyMjY0YTY0OWQ5YThiYTU3ODc3OQ==
   data.tar.gz: !binary |-
-    MzJjNjAxZGQ3OWI2YTc2Yzg1NDdlZTk5ZjgwYjEwNmZhYzU5ODU4Ng==
+    YTdlMTFiMjJjNjEzOGY4YTVmZDQzZTQwYTc3ZjI0ZGE1ZGI2ZThkNw==
 SHA512:
   metadata.gz: !binary |-
-    OGJmYWU3ZDlkNjQ1YTQxYjhhNzIyMDg1MDE2YmI5MTExN2Q4MjYxMDMwOTU4
-    NDQ5ZGE0YTlmN2I3MTA2YTMzNzg3ZjljM2ZiMjgwYjY5YTFhYjI2NGE5Mjhi
-    MDE1ZDM5Y2JjMzEwMWM3YTllODA3ODhjOTMyYTYwYjE2ZTFlOTU=
+    NzMwMzRiNjBlNWE2NmU2MTQwNDkzY2VjNzcyNDE5NGM3MjEzYzZiNGIxZDZm
+    ZmY3MzdhMTQwOWFkNmNjMzFiZTc5OTdmNjg2ZTRhMWFmZTIwNzJhNzQzNmNl
+    MzliZjUwNjZlMjA4YmZjN2VjMWI2NjZlZjM5MDcxZTExY2M1NzM=
   data.tar.gz: !binary |-
-    MWIwODkwMWFmMTQwZDUzZTQ3ODViZDE1ZGI0YTQ4YjEzNmYyODgzNzk4OGQz
-    Zjg3OTAyYTI3OWYyMDJmODY5NTMwNzE3Nzg1OTBhYjg1ZmE4NTVmODE2OGE1
-    Njc4MjRkYmEyNDBmZDVlN2E5YzMxMjI5OTlmNDg1MjU4ZjA3M2Q=
+    NTc2YmYwZWExNjZiNDdmMDlhNWM3NTc4NTk0OGQ3NTJkZTEzODYyYWM2NjVh
+    ZGY3MWM0MTRhOTQ5N2Q3MjM1YTVkZWU1MzVjOWQ1M2ZkZTg1MTljODdkYmYw
+    OTZlMzY4MDQ5MWYzYWI0YmY4Nzg4NTQ0YTRmODhlOThmNDQ5Mjk=

data/etc/bricks/helper/builder

@@ -2,5 +2,5 @@
 
 info() {
   message=$1;
-  echo -e "\n\n\033[32m${message}\033[0m";
+  echo -e "\033[32m${message}\033[0m";
 }

data/etc/bricks/helper/start

@@ -0,0 +1,33 @@
+#!/bin/bash -le
+
+. $BRICKS_HOME/builder
+
+builder() {
+  eval $BRICKY_ENTRYPOINTS
+}
+
+builder_source() {
+  scripts=$(echo $BRICKY_ENTRYPOINTS | tr " && " "\n")
+  cat $scripts > /tmp/builderplan
+  grep -v "bin/bash" /tmp/builderplan | more 
+}
+
+shell() {
+    export -f builder
+    export -f builder_source
+
+    info "\n\nType 'builder' to build the project :p"
+    info "Type 'builder_source' to see the bricks compilation :p\n\n"
+    /bin/bash
+}
+
+start() {
+  if [[ "$BRICKY_ENTRYPOINTS_SHELL" == "true" ]]
+  then
+    shell
+  else
+    builder
+  fi
+}
+
+start

data/etc/templates/bricky/images/builder/Dockerfile

@@ -1,2 +1,16 @@
-FROM locaweb/wheezy:development
+# The image locaweb/wheezy-ruby2x contains the following packages:
+# locaweb's: ruby, ruby-dev, and bundler packages, and a lots of
+# tools inherits from wheezy:development, ex: build-essential.
+FROM locaweb/wheezy-ruby2x:development
 MAINTAINER bricky
+
+# Small dependencies cheatsheet: 
+#
+# sqlite: sqlite3, libsqlite3-dev
+# nokogiri: libxml2-dev libxslt-dev
+# mysql: libmysqlclient-dev
+# sqlserver: freetds-dev
+# postgresql: libpq-dev
+
+# RUN apt-get update
+# RUN apt-get install --no-install-recommends -y --force-yes <your-deps-here>

data/lib/bricky/bricks/bundle.rb

@@ -1,3 +1,4 @@
+require "digest"
 require "fileutils"
 
 module Bricky

data/lib/bricky/command.rb

@@ -10,17 +10,21 @@ module Bricky
   class Command < Thor
     desc :install, "copy configuration files"
     def install
-      Bricky::Commands::Install.new.execute
+      command = Bricky::Commands::Install.new
+      command.execute
     end
 
     desc :bootstrap, "bootstrap project images"
     def bootstrap
-      Bricky::Commands::Bootstrap.execute
+      command = Bricky::Commands::Bootstrap.new 
+      command.execute
     end
 
     desc :builder, "build project"
+    method_option :shell, :type => :boolean, :aliases => "-s"
     def builder
-      Bricky::Commands::Builder.execute
+      command = Bricky::Commands::Builder.new(options)
+      command.execute
     end
   end
 end

data/lib/bricky/commands/bootstrap.rb

@@ -3,9 +3,7 @@ require "fileutils"
 
 module Bricky
   module Commands
-    module Bootstrap
-      extend self
-
+    class Bootstrap
       def execute
         puts "Boostraping images".colorize(:light_blue)
         images.each {|image| build(image)}
@@ -17,7 +15,7 @@ module Bricky
           hack = command(image.name, create_hack_image(image))
 
           [base, hack].each do |code|
-            puts "Processing #{name} image: ".colorize(:blue) + code
+            puts "Processing '#{image.name}' image: ".colorize(:blue) + code
             
             unless system(code)
               puts "~~~~~~~~~~~ Problems building image ~~~~~~~~~~~".colorize(:white).on_red

data/lib/bricky/commands/builder.rb

@@ -2,8 +2,12 @@ require "bricky/bricks"
 
 module Bricky
   module Commands
-    module Builder
-      extend self
+    class Builder
+      attr_accessor :options
+
+      def initialize(options)
+        @options = options
+      end
 
       def execute
         puts "Building Project".colorize(:light_blue)
@@ -11,8 +15,8 @@ module Bricky
       end
 
       private
-        def build(image)
-          code = command(image)
+        def build(images)
+          code = command(images)
           puts format(code)
           
           unless system(code)
@@ -24,12 +28,7 @@ module Bricky
         end
 
         def command(image)
-          bricks = Bricky::Bricks.resolve
-          envs = bricks.collect(&:environments).uniq.join(" ")
-          arguments = bricks.collect(&:arguments).uniq.join(" ")
-          entrypoints = bricks.collect(&:entrypoint).compact.uniq.join(" && ")
-
-          "docker run #{envs} #{arguments} -i -t #{image.name} /bin/bash -l -c '#{entrypoints}'"
+          "docker run #{envs} #{arguments} -i -t #{image.name} /bricks/helper/start"
         end
 
         def format(command)
@@ -37,6 +36,25 @@ module Bricky
             result.split(param).join("\n\t #{param}")
           end
         end
+
+        def bricks
+          @bricks ||= Bricky::Bricks.resolve 
+        end
+
+        def envs
+          environments = bricks.collect(&:environments)
+          environments << "-e BRICKY_ENTRYPOINTS='#{entrypoints}'"
+          environments << "-e BRICKY_ENTRYPOINTS_SHELL=#{options.fetch("shell", false)}"
+          environments.join(" ")
+        end
+
+        def arguments
+          args = bricks.collect(&:arguments).uniq.join(" ")
+        end
+
+        def entrypoints
+          bricks.collect(&:entrypoint).compact.uniq.join(" && ")
+        end
     end
   end
 end

data/lib/bricky/version.rb

@@ -1,3 +1,3 @@
 module Bricky
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bricky
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - andrerocker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,6 +92,7 @@ files:
 - etc/bricks/bundle/builder
 - etc/bricks/debian/builder
 - etc/bricks/helper/builder
+- etc/bricks/helper/start
 - etc/bricks/helper/suexec
 - etc/bricks/mounts/builder
 - etc/hacker/id_container/Dockerfile