bosh-gen 0.14.0 → 0.15.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZGY3MjdjNjc4MzQ1Y2Q0MjNmZTM1Mzg4ODYxNDJlNzFjMjdmMGRiNQ==
-  data.tar.gz: !binary |-
-    NWE2ZWFjMGY5MmZiYWI4NTU0MjU2MmY4NGRmMDdiODc0MThkYjIxMw==
+SHA1:
+  metadata.gz: 7e787702a0c2065e8ef109955c23c6fb02ae4afa
+  data.tar.gz: bf3debd3e2307c2dbfc8e4fecbaed7033078b277
 SHA512:
-  metadata.gz: !binary |-
-    MjAxNTliZDc2M2Y4ZWFiNjA0ZTgwYjI5Zjg2NjI1ODY1NTc2ZWJkMDBkNDNk
-    MWM4OWE0NTE3MTFhNDY1NzE3MzZkMjQxYzliOWRiMzYyZDk4MDlkMzZhZDEx
-    MmY0OGVkNDYwMTk3MzgxYmIyOWI4NDA1MTRjNjkwNmNkZWQ0ZjY=
-  data.tar.gz: !binary |-
-    NWJlMzBlYzY2OTlmMjEwNGE3YTA3YWEyNzk3OTMxOWRhNDBmZDYyNzZiMzg3
-    MjBjNTRkM2U2Y2I3ODZkMGNiOWVmYjE4NzM1NzUyZjg4NGVjNDJlNWVjZjgw
-    ZWY4NzlhNWY3MGRlMWYxYmJiMDhjZDRiMDVmNDE1YjY1NWI0OWY=
+  metadata.gz: dc7c4b0d56e4c41112f888f9412a62843bf3d31b9e1e3d5606d5b151d2e2f27763e6da770a09a7a5b6c08eee191355ce8ecd04c4801c249386154529456155ca
+  data.tar.gz: 5798bf47c3de53926c358c089e817a13bed0b287a6e8981e9e4e52dc70e4214d1cdb6e1fe7cbf5a211e6e13a7f160e4210e14858013478aad4042cc95fbf6096

data/ChangeLog.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## v0.15.0
+
+* Create packages from existing Aptitude .deb packages with `package --apt`
+* Assume project & job names have hyphens in templates
+* Templates default to latest stemcell [Aristoteles Neto]
+
 ## v0.14.0
 
 * templates/make_manifest & example spiff templates generated

data/lib/bosh/gen/cli.rb

@@ -27,6 +27,8 @@ module Bosh
       end
       
       desc "package NAME", "Create a new package"
+      method_option :apt, :type => :boolean, 
+        :desc => "Create package using debian/ubuntu apt .debs"
       method_option :dependencies, :aliases => ['-d'], :type => :array, 
         :desc => "List of package dependencies"
       method_option :files,        :aliases => ['-f'], :type => :array, 
@@ -35,11 +37,16 @@ module Bosh
         :desc => "List of existing sources to use, e.g. --src 'myapp/**/*'"
       def package(name)
         dependencies = options[:dependencies] || []
-        files        = options[:files] || []
-        sources      = options[:src] || []
-        require 'bosh/gen/generators/package_generator'
-        Bosh::Gen::Generators::PackageGenerator.start(
-          [name, dependencies, files, sources])
+        if options[:apt]
+          require 'bosh/gen/generators/package_apt_generator'
+          Bosh::Gen::Generators::PackageAptGenerator.start([name, dependencies])
+        else
+          files        = options[:files] || []
+          sources      = options[:src] || []
+          require 'bosh/gen/generators/package_generator'
+          Bosh::Gen::Generators::PackageGenerator.start(
+            [name, dependencies, files, sources])
+        end
       end
       
       desc "source NAME", "Downloads a source item into the named project"

data/lib/bosh/gen/generators/new_release_generator/templates/templates/infrastructure-aws-ec2.yml.tt

@@ -6,7 +6,7 @@ meta:
 
   stemcell:
     name: bosh-aws-xen-ubuntu
-    version: 1722
+    version: latest
 
 jobs:
   - name: <%= project_name_underscored %>_leader_z1

data/lib/bosh/gen/generators/new_release_generator/templates/templates/infrastructure-warden.yml.tt

@@ -4,7 +4,7 @@ meta:
 
   stemcell:
     name: bosh-warden-boshlite-ubuntu
-    version: 24
+    version: latest
 
 update:
   canaries: 1

data/lib/bosh/gen/generators/new_release_generator/templates/templates/jobs.yml.tt

@@ -9,12 +9,12 @@ update:
 
 jobs:
   - name: <%= project_name_underscored %>_leader_z1
-    template: <%= project_name_underscored %>
+    template: <%= project_name_hyphenated %>
     instances: 0
     resource_pool: small_z1
     networks: (( merge ))
   - name: <%= project_name_underscored %>_z1
-    template: <%= project_name_underscored %>
+    template: <%= project_name_hyphenated %>
     instances: 0
     resource_pool: small_z1
     networks: (( merge ))
@@ -25,3 +25,5 @@ jobs:
         master: (( merge ))
 
 networks: (( merge ))
+
+properties: {}

data/lib/bosh/gen/generators/new_release_generator/templates/templates/make_manifest.tt

@@ -54,7 +54,6 @@ perl -pi -e "s/NAME/$NAME/g" $tmpdir/stub-with-uuid.yml
 spiff merge \
   $templates/deployment.yml \
   $templates/jobs.yml \
-  $templates/properties.yml \
   $templates/infrastructure-${infrastructure}.yml \
   $tmpdir/stub-with-uuid.yml \
   $* > $tmpdir/$NAME-manifest.yml

data/lib/bosh/gen/generators/new_release_generator/templates/templates/stub.yml.tt

@@ -9,5 +9,5 @@ meta:
 director_uuid: PLACEHOLDER-DIRECTOR-UUID
 
 releases:
-  - name: <%= project_name_underscored %>
+  - name: <%= project_name_hyphenated %>
     version: latest

data/lib/bosh/gen/generators/package_apt_generator.rb

@@ -0,0 +1,107 @@
+require 'yaml'
+require 'thor/group'
+
+module Bosh::Gen
+  module Generators
+    class PackageAptGenerator < Thor::Group
+      include Thor::Actions
+
+      argument :name
+      argument :dependencies, :type => :array
+
+      def self.source_root
+        File.join(File.dirname(__FILE__), "package_apt_generator", "templates")
+      end
+
+      def check_root_is_release
+        unless File.exist?("jobs") && File.exist?("packages")
+          raise Thor::Error.new("run inside a BOSH release project")
+        end
+      end
+
+      def check_name
+        raise Thor::Error.new("'#{name}' is not a valid BOSH id") unless name.bosh_valid_id?
+      end
+
+      def warn_missing_dependencies
+        dependencies.each do |d|
+          raise Thor::Error.new("dependency '#{d}' is not a valid BOSH id") unless d.bosh_valid_id?
+          unless File.exist?(File.join("packages", d))
+            say_status "warning", "missing dependency '#{d}'", :yellow
+          end
+        end
+      end
+
+      def packaging
+        create_file package_dir("packaging") do
+          <<-SHELL.gsub(/^\s{10}/, '')
+          set -e # exit immediately if a simple command exits with a non-zero status
+          set -u # report the usage of uninitialized variables
+          
+          # Available variables
+          # $BOSH_COMPILE_TARGET - where this package & spec'd source files are available
+          # $BOSH_INSTALL_TARGET - where you copy/install files to be included in package
+          
+          mkdir -p $BOSH_INSTALL_TARGET/apt
+          
+          for DEB in $(ls -1 apt/#{name}/*.deb); do
+            echo "Installing $(basename $DEB)"
+            dpkg -x $DEB $BOSH_INSTALL_TARGET/apt
+          done
+          
+          cp -a apt/#{name}/profile.sh $BOSH_INSTALL_TARGET/
+          SHELL
+        end
+      end
+
+      def package_specification
+        src_files = ["apt/#{name}/profile.sh", "apt/#{name}/*.deb"]
+        config = { "name" => name, "dependencies" => dependencies, "files" => src_files }
+        create_file package_dir("spec"), YAML.dump(config)
+      end
+
+      def common_helpers
+        directory 'src/apt'
+        chmod 'src/apt/fetch_debs.sh', 0755
+      end
+
+      def vagrantfile
+        copy_file 'Vagrantfile'
+      end
+
+      def show_instructions
+        say "Next steps:", :green
+        say <<-README.gsub(/^        /, '')
+          1. Edit src/apt/#{name}/aptfile to specify list of debian packages to install
+          2. Provision vagrant and run script to fetch debian packages:
+
+            vagrant up
+            vagrant ssh -c '/vagrant/src/apt/fetch_debs.sh #{name}'
+            vagrant destroy
+
+          You can search for aptitude debian packages using apt-cache:
+
+            vagrant ssh -c 'apt-cache search #{name} | sort'
+        README
+      end
+
+      private
+      def package_dir(path)
+        "packages/#{name}/#{path}"
+      end
+
+      def src_dir(path)
+        "src/#{name}/#{path}"
+      end
+
+      def blob_dir(path)
+        "blobs/#{name}/#{path}"
+      end
+
+      def deb_package_name
+        name
+      end
+
+    end
+  end
+end

data/lib/bosh/gen/generators/package_apt_generator/templates/Vagrantfile

@@ -0,0 +1,13 @@
+# Vagrant used to allow non-Ubuntu hosts to execute
+# apt-get commands to fetch debian packages.
+Vagrant.configure('2') do |config|
+
+  config.vm.hostname='boshrelease-builder'
+  config.vm.box = "lucid64"
+
+  # Need NFS enabled, and hence a private network for virtualbox
+  # as discussed in this project's patch
+  # https://github.com/reidab/citizenry/commit/590ca245b9a4fc96c55ab7bc3bbafa38583f8cda
+  config.vm.network "private_network", ip: "192.168.50.5"
+  config.vm.synced_folder ".", "/vagrant", type: "nfs"
+end

data/lib/bosh/gen/generators/package_apt_generator/templates/src/apt/%name%/aptfile.tt

@@ -0,0 +1 @@
+<%= deb_package_name %>

data/lib/bosh/gen/generators/package_apt_generator/templates/src/apt/%name%/profile.sh.tt

@@ -0,0 +1,5 @@
+export PATH="/var/vcap/packages/<%= name %>/apt/usr/bin:$PATH"
+export LD_LIBRARY_PATH="/var/vcap/packages/<%= name %>/apt/usr/lib:$LD_LIBRARY_PATH"
+export INCLUDE_PATH="/var/vcap/packages/<%= name %>/apt/usr/include:$INCLUDE_PATH"
+export CPATH="$INCLUDE_PATH"
+export CPPPATH="$INCLUDE_PATH"

data/lib/bosh/gen/generators/package_apt_generator/templates/src/apt/fetch_debs.sh

@@ -0,0 +1,70 @@
+set -e          # exit immediately if a simple command exits with a non-zero status
+set -u          # report the usage of uninitialized variables
+set -o pipefail # return value of a pipeline is the value of the last (rightmost) command to exit with a non-zero status
+
+# Usage: src/common/fetch_debs.sh postgresql [src/apt/postgresql]
+#
+#   src/common/fetch_debs.sh postgresql
+#   src/common/fetch_debs.sh postgresql src/apt/postgresql
+#
+PACKAGE_NAME=$1
+RELEASE_DIR=${RELEASE_DIR:-/vagrant}
+if [[ "${2:-X}" == "X" ]]; then
+    PACKAGE_SRC_DIR=$RELEASE_DIR/src/apt/$PACKAGE_NAME
+else
+    PACKAGE_SRC_DIR=$RELEASE_DIR/$2
+fi
+APTFILE=$PACKAGE_SRC_DIR/aptfile
+APT_CACHE_DIR="$RELEASE_DIR/tmp/apt/cache/$PACKAGE_NAME"
+APT_STATE_DIR="$RELEASE_DIR/tmp/apt/state"
+BLOBS_DIR=$RELEASE_DIR/blobs/apt/$PACKAGE_NAME
+
+function error() {
+  echo " !     $*" >&2
+  exit 1
+}
+
+function topic() {
+  echo "-----> $*"
+}
+
+function indent() {
+  c='s/^/       /'
+  case $(uname) in
+    Darwin) sed -l "$c";;
+    *)      sed -u "$c";;
+  esac
+}
+
+topic "Environment information"
+echo $0                | indent
+uname -a               | indent
+pwd                    | indent
+
+# Invoke apt-get to ensure it exists
+if [[ "$(which apt-get)X" == "X" ]]; then
+    error "Cannot find apt-get executable. Run this script within a Debian/Ubuntu environment."
+fi
+which apt-get          | indent
+
+echo $APTFILE          | indent
+if [[ ! -f $APTFILE ]]; then
+    error "Missing source file $APTFILE"
+fi
+
+mkdir -p "$APT_CACHE_DIR/archives/partial"
+mkdir -p "$APT_STATE_DIR/lists/partial"
+mkdir -p $BLOBS_DIR
+
+APT_OPTIONS="-o debug::nolocking=true -o dir::cache=$APT_CACHE_DIR -o dir::state=$APT_STATE_DIR"
+
+topic "Updating apt caches"
+apt-get $APT_OPTIONS update | indent
+
+for PACKAGE in $(cat $APTFILE); do
+  topic "Fetching .debs for $PACKAGE"
+  apt-get $APT_OPTIONS -y -d install $PACKAGE | indent
+done
+
+topic "Copying .debs to blobs"
+cp -a $APT_CACHE_DIR/archives/*.deb $BLOBS_DIR/

data/lib/bosh/gen/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Gen
-    VERSION = "0.14.0"
+    VERSION = "0.15.0"
   end
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: bosh-gen
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bosh_cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
 - !ruby/object:Gem::Dependency
   name: minitest-colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Generators for creating BOSH releases
@@ -116,7 +116,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - ChangeLog.md
 - Gemfile
 - Guardfile
@@ -170,8 +170,13 @@ files:
 - lib/bosh/gen/generators/new_release_generator/templates/templates/infrastructure-warden.yml.tt
 - lib/bosh/gen/generators/new_release_generator/templates/templates/jobs.yml.tt
 - lib/bosh/gen/generators/new_release_generator/templates/templates/make_manifest.tt
-- lib/bosh/gen/generators/new_release_generator/templates/templates/properties.yml.tt
 - lib/bosh/gen/generators/new_release_generator/templates/templates/stub.yml.tt
+- lib/bosh/gen/generators/package_apt_generator.rb
+- lib/bosh/gen/generators/package_apt_generator/templates/.gitkeep
+- lib/bosh/gen/generators/package_apt_generator/templates/Vagrantfile
+- lib/bosh/gen/generators/package_apt_generator/templates/src/apt/%name%/aptfile.tt
+- lib/bosh/gen/generators/package_apt_generator/templates/src/apt/%name%/profile.sh.tt
+- lib/bosh/gen/generators/package_apt_generator/templates/src/apt/fetch_debs.sh
 - lib/bosh/gen/generators/package_generator.rb
 - lib/bosh/gen/generators/package_generator/templates/.gitkeep
 - lib/bosh/gen/generators/package_source_generator.rb
@@ -239,17 +244,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: ''

data/lib/bosh/gen/generators/new_release_generator/templates/templates/properties.yml.tt

@@ -1,5 +0,0 @@
-properties:
-  networks:
-    apps: <%= project_name_underscored %>1
-
-  <%= project_name_underscored %>: {}