bricky 0.0.11 → 0.0.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDNlNzA0N2E2MTkyMTdjNTEwZGI5ODRkZjJlODk3NzVkY2EyMjgyOQ==
+    NzY4ZjIwODYzODQ0OGIyN2JlMGJmOTdkYTdhYjliMzgzMmM4N2U1OA==
   data.tar.gz: !binary |-
-    NWUyNWNkMjc2NmIzNjYzOWNkODA5ZDc0ZTllMDg2ZDc5NDIzNDU1OQ==
+    ZmIyN2U4ODdkYmExMTJiZTFkZDNjMWM1MjhiMDczMzQ3OTE2OGI0MQ==
 SHA512:
   metadata.gz: !binary |-
-    ZWE3YTE0MGY0ZTM3NDhkYmI1MWU5NWUyZmMzYzllOTMxZTRiODVlNzY1MmRj
-    NjMxN2Q2ZGRjYzA4ZWE1OGY2ZTdkYmJjNzRjOTA3YmRlNmE0NDhhYjY1MTVk
-    YTJhNDhkMTBlYTIwOGZhYjA4OTI0MDBiMjQzNjIyN2MyYTkxNWQ=
+    YzZjNjRiZDk1OTUxMGNiYWQzZGJlODY4ZGU0Yjg4YmIyMmQ1YjZlMDBmM2Mz
+    MmMyMTY2MTQ1ZjQ0MWYxZmY2ZjM2OTQzZmM4YzA4M2ZmOTFhMTMyMGJmYTdi
+    MmMwZDE1YTg1NTU1MGFjN2VhYjhkOTE3N2Y4ZjM0OTQ4ZDU1NTM=
   data.tar.gz: !binary |-
-    YmY4NmY2MmU1YmFkZWZhMGJjNTFlZWY0OWU3MjQ1ZDRkODNjYzI2N2M0ZjJh
-    NTJjNGMxMWM5Mjg3OWYyZTNmZTMzMDk4MDQ1ZTA5MWE1OTMwNjA1MTZlYTU1
-    OTAzZGRmYjEwZDg2ODIwNjMwNDFlMGRkMjlmZmQ3Mjc3MGExZGQ=
+    MWVhNzkyODFmOTIxM2M1MzE5OWRhZjNmMmZiYTQ2NThmNzRhMjEwZGI1ZTE3
+    OTE3NjhlMDA4ZTMyNTI1Y2ViMjhiMmY0MzBjYTFmYjYzODk4NTdjNDAzNmFh
+    NTNkZWIxMGI3NzAwMDhiODM5Y2RmNDYyNzk3YTUwYzliMThhMjc=

data/etc/bricks/debian/builder

@@ -12,9 +12,6 @@ debian() {
   info 'Moving deb files to volume'
   rm -Rf /builded/*
   mv /opt/workspace/*.deb /builded/
-
-  info 'Recreating local debian packages index'
-  dpkg-scanpackages /builded/ | gzip > /builded/Packages.gz
 }
 
 suexec debian

data/etc/bricks/helper/suexec

@@ -5,5 +5,21 @@
 suexec() {
   name=$1
   export -f $name
+
+  if [[ $BRICKS_LINUX == "true" ]]
+  then
+    execute_linux $name
+  else
+    execute_other $name
+  fi
+}
+
+execute_other() {
+  name=$1
+  execute $name
+}
+
+execute_linux() {
+  name=$1
   su builder -m -c "bash -ec 'execute $name'"
 }

data/etc/templates/bricky/bricky.yml

@@ -7,7 +7,7 @@ bricky:
       ignore:
         - source/log
         - source/tmp
-        - source/.git
+        - source/vendor/bundle
     bundle:
       cache: true
       without: development:test

data/lib/bricky.rb

@@ -1,4 +1,5 @@
 require "bricky/config"
+require "bricky/logger"
 require "bricky/command"
 require "bricky/version"
 
@@ -12,4 +13,8 @@ module Bricky
   def config
     @config ||= Bricky::Config.new
   end
+
+  def logger
+    @logger ||= Bricky::Logger.new 
+  end
 end

data/lib/bricky/bricks.rb

@@ -16,15 +16,13 @@ module Bricky
       end.uniq
     end
 
-    def resolve_and_initialize(name, config)
-      return Bricky::Bricks::Bundle.new(config) if name.eql? "bundle"
-      return Bricky::Bricks::Debian.new(config) if name.eql? "debian"
-      return Bricky::Bricks::Mounts.new(config) if name.eql? "mounts"
-    end
-
     private
       def default_bricks
         [Bricky::Bricks::Helper.new({})]
       end
+
+      def resolve_and_initialize(name, config)
+        Bricky::Bricks.const_get("#{name.to_s.capitalize}").new(config)
+      end
   end
 end

data/lib/bricky/bricks/base.rb

@@ -7,6 +7,9 @@ module Bricky
         self.config = config
       end
 
+      def arguments
+      end
+
       def entrypoint
       end
 

data/lib/bricky/bricks/bundle.rb

@@ -25,7 +25,7 @@ module Bricky
         end
 
         def local_path
-          path = "#{Bricky.config.tmp_path}/cache/#{digest}"
+          path = "#{Bricky.config.cache_path}/bundle/#{digest}"
           FileUtils::mkdir_p(path)
           path
         end

data/lib/bricky/bricks/helper.rb

@@ -6,8 +6,14 @@ module Bricky
       end
 
       def environments
-        ["-e BRICKS_HOME=/bricks/helper"]
+        ["-e BRICKS_LINUX=#{linux}",
+          "-e BRICKS_HOME=/bricks/helper"]
       end
+
+      private
+        def linux
+          RUBY_PLATFORM.include?("linux")
+        end
     end
   end
 end

data/lib/bricky/command.rb

@@ -16,18 +16,11 @@ module Bricky
       dispatch(:install)
     end
 
-    desc :bootstrap, "bootstrap builder images"
-    def bootstrap
-      requirements.check_and_execute do
-        dispatch(:bootstrap)
-      end
-    end
-
     desc :builder, "build project"
     method_option :shell, :type => :boolean, :aliases => "-s"
     def builder
       requirements.check_and_execute do
-        dispatch(:builder)
+        dispatch(:bootstrap) && dispatch(:builder)
       end
     end
 
@@ -38,8 +31,7 @@ module Bricky
 
       def dispatch(name)
         clazz = Bricky::Commands.const_get("#{name.to_s.capitalize}")
-        command = clazz.new(options)
-        command.execute
+        clazz.new(options).execute
       end
   end
 end

data/lib/bricky/commands/base.rb

@@ -8,6 +8,10 @@ module Bricky
       def initialize(options)
         @options = options
       end
+
+      def logger
+        Bricky.logger
+      end
     end
   end
 end

data/lib/bricky/commands/bootstrap.rb

@@ -5,8 +5,13 @@ module Bricky
   module Commands
     class Bootstrap < Base
       def execute
-        puts "Boostraping images".colorize(:light_blue)
-        images.each {|image| build(image)}
+        logger.important "Boostraping images"
+
+        if need_rebuild?
+          build(image)
+        else
+          logger.message "Skipping bootstrap process"
+        end
       end
 
       private
@@ -15,14 +20,15 @@ module Bricky
           hack = command(image.name, create_hack_image(image))
 
           [base, hack].each do |code|
-            puts "Processing '#{image.name}' image: ".colorize(:blue) + code
+            logger.message "Processing '#{image.name}' image: ", code
             
             unless system(code)
-              puts "~~~~~~~~~~~ Problems building image ~~~~~~~~~~~".colorize(:white).on_red
+              logger.failure "~~~~~~~~~~~ Problems building image ~~~~~~~~~~~"
               return false
             end
           end
 
+          make_cache!
           true
         end
 
@@ -30,8 +36,8 @@ module Bricky
           "docker build -t #{template_name} #{image_path}"
         end
 
-        def images
-          ["builder"].collect {|image| Bricky::Image.new(image) }
+        def image
+          @image ||= Bricky::Image.new("builder")
         end
 
         def create_hack_image(image)
@@ -52,6 +58,25 @@ module Bricky
 
           parser.result(variables.get_binding)
         end
+
+        def cache_file
+          "#{Bricky.config.cache_path}/builder"
+        end
+
+        def need_rebuild?
+          cache_digest = open(cache_file).read rescue "dummy"
+          image_digest = Digest::MD5.file(image.full_path).hexdigest
+
+          return false if cache_digest.eql?(image_digest)
+          true  
+        end
+
+        def make_cache!
+          FileUtils::mkdir_p(Bricky.config.cache_path)
+          open(cache_file, 'w') do |file|
+            file.write Digest::MD5.file(image.full_path).hexdigest
+          end
+        end
     end
   end
 end

data/lib/bricky/commands/builder.rb

@@ -4,17 +4,17 @@ module Bricky
   module Commands
     class Builder < Base
       def execute
-        puts "Building Project".colorize(:light_blue)
+        logger.important 'Building Project'
         build(Bricky::Image.new("builder"))
       end
 
       private
         def build(images)
           code = command(images)
-          puts format(code)
+          logger.debug format(code)
           
           unless system(code)
-            puts "~~~~~~~~~~~ Problems building image ~~~~~~~~~~~".colorize(:white).on_red
+            logger.failure '~~~~~~~~~~~ Problems building image ~~~~~~~~~~~'
             return false
           end
 
@@ -26,7 +26,7 @@ module Bricky
         end
 
         def format(command)
-          ["-v ", "-i ", "-e "].inject(command) do |result, param|
+          ['-v ', '-i ', '-e '].inject(command) do |result, param|
             result.split(param).join("\n\t #{param}")
           end
         end
@@ -43,11 +43,11 @@ module Bricky
         end
 
         def arguments
-          args = bricks.collect(&:arguments).uniq.join(" ")
+          args = bricks.collect(&:arguments).uniq.join(' ')
         end
 
         def entrypoints
-          bricks.collect(&:entrypoint).compact.uniq.join(" && ")
+          bricks.collect(&:entrypoint).compact.uniq.join(' && ')
         end
     end
   end

data/lib/bricky/commands/install.rb

@@ -1,7 +1,11 @@
+require "thor"
+require "thor/group"
+
 module Bricky
   module Commands
     class Install < Base
       def execute
+        logger.important 'Setup bricky configuration files'
         installer = InstallThor.new
         installer.execute
       end 
@@ -11,13 +15,12 @@ module Bricky
         include Thor::Actions
 
         def execute
-          puts "Setup bricky configuration files".colorize(:light_blue)
-          directory "bricky"
-          copy_file "Brickyfile"
+          directory 'bricky'
+          copy_file 'Brickyfile'
         end
 
         def self.source_root
-          File.expand_path("../../../../etc/templates", __FILE__)
+          File.expand_path('../../../../etc/templates', __FILE__)
         end
       end
     end

data/lib/bricky/config.rb

@@ -14,6 +14,10 @@ module Bricky
       self.bricks = config["bricks"]
     end
 
+    def cache_path
+      "#{tmp_path}/cache"
+    end
+
     def bricks_path
       File.expand_path("#{base_path}/etc/bricks", __FILE__)
     end

data/lib/bricky/image.rb

@@ -8,6 +8,10 @@ module Bricky
       self.path = format_path(image)
     end
 
+    def full_path
+      "#{path}/Dockerfile"
+    end
+
     private
       def format_name(image)
         "#{Bricky.config.name}/#{image}"

data/lib/bricky/logger.rb

@@ -0,0 +1,30 @@
+require "logger"
+
+module Bricky
+  class Logger < ::Logger
+    def initialize
+      super(STDOUT)
+      self.level = INFO
+      self.formatter = proc do |severity, datetime, progname, msg|
+        "#{msg}\n"
+      end
+    end
+
+    def message(*args)
+      info colorize_first(args, :blue)
+    end
+
+    def failure(*args)
+      error colorize_first(args, :white).on_red
+    end
+
+    def important(*args)
+      info colorize_first(args, :light_blue)
+    end
+
+    private
+      def colorize_first(args, color)
+        [args.first.colorize(color), args[1..-1]].join
+      end
+  end
+end

data/lib/bricky/requirements.rb

@@ -1,23 +1,25 @@
 module Bricky
   class Requirements
     def check_and_execute
-      if pending_requirements
+      if pending?
         print "Make sure you have the following requirements: " 
-        puts requirements.join(',').colorize(:red)
+        puts requirements.join(', ').colorize(:red)
       else
         yield          
       end
     end
 
     private
-      def requirements
-        ["docker"]
-      end
-  
-      def pending_requirements
+      def pending?
         requirements.detect do |command|
           not system("which #{command} > /dev/null 2>&1")
         end
       end
+
+      def requirements
+        requirements = ["docker"]
+        requirements << "boot2docker" unless RUBY_PLATFORM.include?("linux") 
+        requirements
+      end
   end
 end

data/lib/bricky/version.rb

@@ -1,3 +1,3 @@
 module Bricky
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bricky
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - andrerocker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,6 +115,7 @@ files:
 - lib/bricky/commands/install.rb
 - lib/bricky/config.rb
 - lib/bricky/image.rb
+- lib/bricky/logger.rb
 - lib/bricky/requirements.rb
 - lib/bricky/setup.rb
 - lib/bricky/version.rb
@@ -138,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: a smart way to build software packages