bricky 0.0.26 → 0.0.27

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGY4ODk2ZGNkYTg3Y2RjYjk1Y2Y2ZjVmOTQ5N2QzYjY1ZmE1OWE0MQ==
+    YmVlNDRiMDM1NDM1NDU0YjEyMjNjMDBmMzQwZmQ4YjE4ZWFlYmJmNw==
   data.tar.gz: !binary |-
-    YThjNjVlNTc4ZWJiODZkMDhlZGQ1ZjI4ZGFmYzZkZGI3NTA4ZWZhYg==
+    NWMxYzBjZDQyY2VmZTVlMDg5ZjkyMDlhMzZmNjU5OWIxNTkwYmQzNg==
 SHA512:
   metadata.gz: !binary |-
-    MzkyZGYzMzA4ZGY2YTE3NzJjMDUzYThiOGIwYmMzNDAzMjNhMDQ2NTM5N2M1
-    NDk3NDVkMGYwYTcwYTk1OTQxYmNlZTk3YzBmODIzM2Q5ODQ4MTU4NzMwOTQz
-    MTFiZTAzNGMxNGUzNTVkMjFkZGMyODNmNjg1Y2U5OGRiMjYwYTM=
+    M2Q2YjhkMjg4ODliYjdlYjA2ZGE1ZjkyN2M4ZTJlNzE1MGRhNGU0YTlhYTg5
+    Y2U0ODZmZDBjMjBmMDBjYWNjMjkxMDcyY2MyNjM4YzY3NzFkM2I1ZTYzZDc2
+    YWJhMDA5ZjE1YzhlZGE5MjUzYmQ0MTBjZGY3NWZmNmYzYjk1YjA=
   data.tar.gz: !binary |-
-    NDMzMzA2OWVkNjQ0NDdlNDM4NDhkZGUwMDk5N2U3MjViMjA0MDQ5YmM0Mzg3
-    MDBkZmZiNmQwN2Q0MzRhMmUyNzgzYThjMDJiZDBmYmQ4NWViOGM2YTJkMWE5
-    MWE4MjgxNDVhN2E2NGZmY2U3NjExNDZjNjY2MDNjMzYzZjI5ODk=
+    YjIwMDBhZmQ5MTA2NTVlZDUxYjdhOThiNzg2YTdlYzY2MzA5YzM4NDNmM2Mw
+    MDZiMWU1MjVkYzJjYjMwNGNkMmJlMDFlN2UxNzIwZTg1MzQ0ODg4OTM5ZmVm
+    NWNmMTBjNjE0YWE2NTNmZmRkZGQyOTBhZDBmNjhkZjNhYmQ3N2U=

data/etc/bricks/debian/builder

@@ -3,14 +3,36 @@
 . $BRICKS_HOME/suexec
 chown -R builder. /builded
 
+debdch() {
+    info 'Building package changelog'
+    raw_tag=$(git tag | grep v | sort -t. -k 1.2,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)
+    use_tag=$(echo $raw_tag | tr -d 'v')
+    build_number="$(ls /builded/*$use_tag+build.*deb 2> /dev/null | wc -l)"
+    
+    if [ $build_number -gt 0 ]
+    then
+        lastest=$(ls /builded/*$use_tag+build.*deb | sort | tail -1)
+        build_number=$(echo $lastest | awk 'BEGIN{FS="build\."}{print $2}' | awk 'BEGIN{FS="_all.deb"} {print $1}')
+        build_number=$(expr $build_number + 1)
+    fi
+
+    tag="$use_tag+build.$build_number"
+    echo "version: $tag"
+    echo "distribution: unstable"
+    
+    dch --distribution 'unstable' --newVersion "$tag" 'Builded by bricky.'
+}
+
 debian() {
   info 'Starting buildpackage'
-  pushd /opt/workspace/source
-    dpkg-buildpackage -b -rfakeroot
-  popd
+  dpkg-buildpackage -b -rfakeroot
 
   info 'Moving deb files to volume'
   mv /opt/workspace/*.deb /opt/workspace/*.changes  /builded/
+  echo "Builded package available on: $BRICKS_DEBIAN_OUTPUT_PACKAGE_PATH"
 }
 
-suexec debian
+pushd /opt/workspace/source
+  suexec debdch
+  suexec debian
+popd

data/etc/bricks/helper/builder

@@ -1,14 +1,27 @@
 #!/bin/bash -le
 
 info() {
-  message=$1;
-  echo -e "\n\033[32m${message}\033[0m\n";
+    message=$1;
+    echo -e "\n\033[32m${message}\033[0m\n";
+}
+
+show() {
+    message=$1;
+    echo -e "\033[32m${message}\033[0m";
 }
 
 info_bricks() {
-  brick=$1;
-  message=$2;
-  printf "\033[32m%8s\033[0m: ${message}\n" $brick;
+    brick=$1;
+    message=$2;
+    printf "\033[32m%8s\033[0m: ${message}\n" $brick;
+}
+
+pushd() {
+    command pushd "$@" > /dev/null
+}
+
+popd() {
+    command popd "$@" > /dev/null
 }
 
-export -f info info_bricks
+export -f info info_bricks pushd popd

data/etc/bricks/helper/start

@@ -16,8 +16,8 @@ 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"
+    show "\n\nType 'builder' to build the project :p"
+    show "Type 'builder_source' to see the bricks compilation :p\n\n"
     /bin/bash
 }
 

data/lib/bricky/bricks/debian.rb

@@ -4,7 +4,6 @@ module Bricky
   module Bricks
     class Debian < Base
       def arguments
-        builded_path = File.expand_path(ENV.fetch('PACKAGE_OUTPUT_PATH', config['build']))
         scripts_path = "#{bricks_path}/debian"
 
         %W(-v #{builded_path}:/builded
@@ -15,6 +14,10 @@ module Bricky
         "/bricks/debian/builder"
       end
 
+      def environments
+        ["-e BRICKS_DEBIAN_OUTPUT_PACKAGE_PATH=#{File.expand_path(builded_path)}"]
+      end
+
       def bootstrap(bootstrap_path)
         if config.fetch('dependencies', false)
           src = File.expand_path('debian/control')
@@ -26,6 +29,10 @@ module Bricky
       end
 
       private
+      def builded_path
+        File.expand_path(ENV.fetch('BRICKY_PACKAGE_OUTPUT_PATH', config['build']))
+      end
+
       def skip_cached_file(src, dest)
         return false if not File.exists?(dest)
 

data/lib/bricky/bricks/helper.rb

@@ -2,18 +2,24 @@ module Bricky
   module Bricks
     class Helper < Base
       def arguments
-        ["-v #{bricks_path}/helper:/bricks/helper"]
+        ["-v #{bricks_path}/helper:/bricks/helper",
+         "-v #{ssh_auth_socket}:/tmp/ssh-auth.socket"]
       end
 
       def environments
         ["-e BRICKS_LINUX=#{linux}",
-          "-e BRICKS_HOME=/bricks/helper"]
+         "-e BRICKS_HOME=/bricks/helper",
+         "-e SSH_AUTH_SOCK=/tmp/ssh-auth.socket"]
       end
 
       private
         def linux
           RUBY_PLATFORM.include?("linux")
         end
+
+        def ssh_auth_socket
+          ENV['SSH_AUTH_SOCK']
+        end
     end
   end
 end

data/lib/bricky/commands/builder.rb

@@ -20,7 +20,9 @@ module Bricky
             return false
           end
 
-          logger.normal '~~~~~~~~~~~ Success \0/ ~~~~~~~~~~~'
+          unless options['shell']
+            logger.normal '~~~~~~~~~~~ Success \0/ ~~~~~~~~~~~'
+          end
 
           true
         end

data/lib/bricky/version.rb

@@ -1,3 +1,3 @@
 module Bricky
-  VERSION = "0.0.26"
+  VERSION = "0.0.27"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bricky
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - andrerocker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler