gaffer 0.1.0 → 0.1.1

data/Rakefile

@@ -7,7 +7,7 @@ Jeweler::Tasks.new do |s|
 	s.author = "Orion Henry"
 	s.email = "orion@heroku.com"
 	s.homepage = "http://github.com/orionz/gaffer"
-	s.files = FileList["[A-Z]*", "{bin,default,lib,spec}/**/*"]
+	s.files = FileList["[A-Z]*", "{bin,default,lib,spec,templates}/**/*"]
 	s.executables = %w(gaffer)
 	s.add_dependency "git"
 	s.add_dependency "right_aws"

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/gaffer

@@ -4,11 +4,24 @@ require File.dirname(__FILE__) + '/../lib/gaffer'
 
 require 'optparse'
 
+## TODO 
+## proper way to deal with a branch?
+## make rebuild
+## make sure the gpg key stuff works and is getting imported/signed
+## resolve bundle package vs bundle install --deployed
+## resolve build_ids
+
 options = {}
 
 optparse = OptionParser.new do|opts|
   opts.banner = <<banner
-Usage: gaffer [options] ACTION [ DIR [ DIR [ ... ] ] ] 
+Usage: gaffer [options] init               # init a new repo
+       gaffer [options] pull               # pull a repo down from s3
+       gaffer [options] ls                 # list packages in repo
+       gaffer [options] rebuild            # rebuild all repo indexes
+       gaffer [options] build [ DIR ... ]  # build a package
+       gaffer [options] push               # push repo to s3
+       gaffer [options] add [ PKG ... ]    # add package to repo
 banner
 
   opts.on( '-f', '--force', 'Force an action' ) do
@@ -24,25 +37,34 @@ end
 optparse.parse!
 
 command = ARGV.shift
-target  = ARGV.shift || Dir::pwd
+targets = ARGV
+targets = [Dir::pwd] if targets.empty?
 
 gaffer = Gaffer::Base.new(options)
 
-case command
-when "initrepo"
-  gaffer.repro.init
-when "pull"
-  gaffer.repro.pull
-when "build"
-  gaffer.build(target)
-when "push"
-  gaffer.repro.push
-when "add"
-  gaffer.add(target)
-when "publish"
-  gaffer.push gaffer.compile(target)
-else
-  puts "No action: --help for help [#{command}]"
-  exit 1
+begin
+  case command
+  when "init"
+    gaffer.repro.init
+  when "pull"
+    gaffer.repro.pull
+  when "ls"
+    puts gaffer.repro.packages
+  when "rebuild"
+    gaffer.repro.rebuild
+  when "build"
+    targets.each { |target| gaffer.build target }
+  when "push"
+    gaffer.repro.push
+  when "add"
+    targets.each { |target| gaffer.add target }
+  when "publish"
+#    gaffer.push gaffer.compile(target)
+  else
+    puts "No action: --help for help [#{command}]"
+    exit 1
+  end
+rescue Object => e
+  puts "ERROR: #{e.message}"
+  exit 2
 end
-

data/lib/gaffer/base.rb

@@ -7,6 +7,7 @@ module Gaffer
     end
 
     def build(dir)
+      @dir     = dir
       @git     = Git::open(dir)
 
       @project = File::basename(File::dirname(@git.repo.path))
@@ -19,8 +20,7 @@ module Gaffer
 
       raise "Bad version #{@version}" unless @version =~ /^\d+[.]\d+[.]\d+$/
 
-      build_id = @git.tags.map { |a| a.name =~ /^#{@version}-(.+)/; $1.to_i }.sort.last.to_i + 1
-      @build_name = "#{@version}-#{build_id}"
+      @build_name = "#{@version}-#{next_build_id}"
 
       puts "======> #{@version.inspect}"
 
@@ -31,11 +31,20 @@ module Gaffer
 #      Gaffer::Deb::new(self, "#{project}-dev", "#{project} (>= #{@version})").build
     end
 
+    def git_build_id
+      @git.tags.map { |a| a.name =~ /^#{@version}-(.+)/; $1.to_i }.sort.last.to_i
+    end
+
+    def repro_build_id
+      repro.packages.map { |p| p =~ /^#{@project}_#{@version}-(\d+)_/; $1 }.reject { |x| x.nil? }.max.to_i rescue 0
+    end
+
+    def next_build_id
+      [git_build_id, repro_build_id].max + 1
+    end
+
     def add(file)
-      file = File.expand_path(file)
-      Dir.chdir(repro_dir) do
-        repro.include(file)
-      end
+      repro.include(file)
     end
 
     def push_changed(dir, &blk)
@@ -54,20 +63,17 @@ module Gaffer
 
       options[:aws_key]    ||= ENV['AWS_ACCESS_KEY_ID']
       options[:aws_secret] ||= ENV['AWS_SECRET_ACCESS_KEY']
-      options[:bucket]     ||= ENV['REP_BUCKET']
-      options[:email]      ||= ENV['REP_EMAIL']
-      options[:maintainer] ||= ENV['REP_MAINTAINER']
+      options[:bucket]     ||= ENV['GAFFER_BUCKET']
+      options[:email]      ||= ENV['GAFFER_EMAIL']
+      options[:maintainer] ||= ENV['GAFFER_MAINTAINER']
+      options[:key]        ||= ENV['GAFFER_KEY']
       options[:key]        ||= options[:email]
 
       options[:codename]   ||= "maverick"
       options[:components] ||= "main"
       options[:force]      ||= !!@force
 
-      dir = repro_dir
-
-      puts "Repo: #{dir}"
-
-      Gaffer::Repro.new(dir, options)
+      Gaffer::Repro.new(repro_dir, options)
     end
 
     def repro_dir

data/lib/gaffer/deb.rb

@@ -12,39 +12,67 @@ module Gaffer
 
     def build
       Dir.mktmpdir do |dir|
-        install_dir = "#{dir}/#{@base.prefix}"
-        Git.clone(@base.dir, install_dir)
+        install_dir = Rush["#{dir}/#{@base.prefix}/"]
+        Git.clone(@base.dir, install_dir.full_path)
         Rush.bash "mkdir #{dir}/DEBIAN"
         File.open("#{dir}/DEBIAN/control", "w") do |f|
           f.write(control)
         end
         puts control
         if @dev
-          Rush.bash "find #{install_dir} | grep -v [.]git | grep -v #{install_dir}$ | xargs rm -rf"
+          Rush.bash "find #{install_dir.full_path} | grep -v [.]git | grep -v #{install_dir.full_path}$ | xargs rm -rf"
         else
-          Rush.bash "find #{install_dir} | grep    [.]git | grep -v #{install_dir}$ | xargs rm -rf"
-#          [ :preinst, :postinst, :prerm, :postrm ].each do |script|
-#            file = File.open("#{dir}/DEBIAN/#{script}","w")
-#            file.chmod(0755)
-#            file.write(template(script))
-#            file.close
-#          end
-          if has_init?
-            puts "INSTALLING init.conf"
-            Rush.bash "mkdir -p #{dir}/etc/init"
-            Rush.bash "cp #{@base.dir}/init.conf #{dir}/etc/init/#{@base.project}.conf"
+          Rush.bash "find #{install_dir.full_path} | grep    [.]git | grep -v #{install_dir.full_path}$ | xargs rm -rf"
+          [ :preinst, :postinst, :prerm, :postrm ].each do |script|
+            file = File.open("#{dir}/DEBIAN/#{script}","w")
+            file.chmod(0755)
+            file.write(template(script))
+            file.close
           end
-          if File.exists?("#{@base.dir}/Gemfile")
-            Dir.chdir(@base.dir) do
-              # TODO this can break in strange ways - STDOUT/STDERR is a mess
-              if Rush.bash('bundle install --deployment').match(/native extensions/)
-                @arch = Rush.bash "dpkg --print-architecture"
-              end
+          if install_dir["sudoers"].exists?
+            Rush["#{dir}/etc/sudoers.d/"].create
+            Rush["#{dir}/etc/sudoers.d/#{project}"].write install_dir["sudoers"].read
+          end
+          if install_dir["init.conf"].exists?
+            puts " * detected init.conf - installing..."
+            Rush["#{dir}/etc/init/"].create
+            Rush["#{dir}/etc/init/#{project}.conf"].write install_dir["init.conf"].read
+            puts "init.conf -> /etc/init/#{project}.conf"
+          elsif install_dir["run"].exists?
+            puts " * detected file 'run' - setting up initfile ..."
+            initfile = template(:init)
+            puts "----"
+            puts initfile
+            puts "----"
+            puts " * installing to /etc/init/#{project}.conf"
+            Rush["#{dir}/etc/init/#{project}.conf"].parent.create
+            Rush["#{dir}/etc/init/#{project}.conf"].write(initfile)
+          end
+          if install_dir["Gemfile"].exists?
+            puts " * Gemfile detected - installing gems before packaging"
+            ## bundle output cannot be trusted - errors go to stdout and output goes to stderr
+            begin
+              install_dir.bash "bundle package 2>&1 > .tmp.bundle.out"
+#              install_dir.bash "bundle install --development 2>&1 > .tmp.bundle.out"
+            rescue Object => e
+              puts " * Bundle error:"
+              puts install_dir[".tmp.bundle.out"].read
+              raise "Bundle failed"
             end
+            puts install_dir[".tmp.bundle.out"].read
+#            if out.match(/native extensions/)
+#                puts "Warning: native extensions - the package is arch specific"
+#                @arch = Rush.bash("dpkg --print-architecture").chomp
+#              end
+#            end
           end
         end
-        Rush.bash "dpkg-deb -b #{dir} ./#{filebase}.deb"
-        File.expand_path("./#{filebase}.deb")
+        puts Rush.bash "pwd"
+        puts "fakeroot dpkg-deb -b #{dir} ./#{filebase}.deb"
+        puts Rush.bash "fakeroot dpkg-deb -b #{dir} ./#{filebase}.deb"
+        x = File.expand_path("./#{filebase}.deb")
+        puts x
+        x
       end
     end
 
@@ -68,6 +96,10 @@ module Gaffer
       ERB.new(File.read("#{File.dirname(__FILE__)}/../../templates/#{type}.erb")).result(binding)
     end
 
+    def origin
+      Rush[@base.dir]
+    end
+
     def maintainer
       @base.maintainer
     end
@@ -76,6 +108,10 @@ module Gaffer
       @base.build_name
     end
 
+    def project
+      @base.project
+    end
+
     def control
       template(:control)
     end

data/lib/gaffer/repro.rb

@@ -15,33 +15,51 @@ module Gaffer
     end
 
     def init
-      if not Dir[@root].empty?
-        raise "Dir #{@root} not empty - cannot init" unless @force
-        FileUtils.rm_rf @root
+      unless root_dir.exists?
+        raise "Dir #{root_dir} exists - cannot init" unless @force
+        root_dir.destroy
       end
       create_dirs
-      write_file "ubuntu/conf/options", options
-      write_file "ubuntu/conf/distributions", distributes
+      conf_dir["options"].write options
+      conf_dir["distributions"].write distributions
       write_version 1
     end
 
+    def packages
+      index_dir["*"].map { |s| s.name }.sort
+    end
+
     def create_dirs
-      repo_dirs.each do |dir|
-        if not File.exists?("#{@root}/ubuntu/#{dir}")
-          puts "* mkdir -p #{@root}/ubuntu/#{dir}"
-          FileUtils.mkdir_p "#{@root}/ubuntu/#{dir}"
-        end
+      repo_dir.create
+      index_dir.create
+      subdirs.each do |dir|
+        repo_dir["#{dir}/"].create
       end
     end
 
     def include(file)
+      f = Rush[File.expand_path(file)]
       bump_version
-      file = File.expand_path(file)
-      Dir.chdir("#{@root}/ubuntu") do
-        run "reprepro includedeb #{@codename} #{file}"
+      raise "File already in index" if index_dir[f.name].exists?
+      f.copy_to index_dir
+      bucket_put "index/#{f.name}"
+      includedeb f
+      f.destroy
+      puts "* #{f.name} -> index/#{f.name}"
+    end
+
+    def rebuild
+      repo_dir["*"].reject { |dir| dir.name == "conf" }.each { |dir| dir.destroy }
+      create_dirs
+      index_dir["*"].each do |file|
+        includedeb file
       end
     end
 
+    def includedeb(file)
+      repo_dir.bash "reprepro includedeb #{@codename} #{file}"
+    end
+
     def ready!
       raise "No repo.  Use 'gaffer pull' to download a repo from S3 or 'gaffer initrepo' to make a new one" unless File.include? "#{@root}/ubuntu/conf/distributions"
     end
@@ -51,6 +69,7 @@ module Gaffer
       puts "Version: #{local_version}"
       delete_remote
       write_remote
+      touch
       puts " [apt source]"
       puts url
       puts ""
@@ -62,6 +81,7 @@ module Gaffer
       puts "Version: #{remote_version}"
       delete_local
       write_local
+      touch
     end
 
     def url
@@ -70,17 +90,10 @@ module Gaffer
 
     private
 
-    def repo_dirs
+    def subdirs
       %w(conf dists incoming indices logs pool project tmp)
     end
 
-    def write_file(path, data)
-      FileUtils.mkdir_p File.dirname("#{@root}/#{path}")
-      File.open("#{@root}/#{path}","w") do |f|
-        f.write(data)
-      end
-    end
-
     def options
       d = []
       d << "ask-passphrase"
@@ -88,7 +101,7 @@ module Gaffer
       d.join("\n") + "\n"
     end
 
-    def distributes
+    def distributions
       d = []
       d << "Origin: #{@maintainer}"
       d << "Label: #{@maintainer} Deploy Repo"
@@ -101,10 +114,7 @@ module Gaffer
     end
 
     def run(cmd)
-      Dir.chdir("#{@root}/ubuntu") do
-        puts "DEBUG: #{cmd}"
-        system(cmd) || (raise "Commmand failed: #{cmd}")
-      end
+      repo_dir.bash cmd
     end
 
     def s3
@@ -113,12 +123,12 @@ module Gaffer
     end
 
     def remote
-      bucket.keys('prefix' => 'ubuntu').map { |k| k.to_s }
+      bucket.keys.map { |k| k.to_s }
     end
 
     def local
       Dir.chdir(@root) do
-         Dir["**/*"].reject { |f| File.directory?(f) }
+        Dir["**/*"].reject { |f| File.directory?(f) }
       end
     end
 
@@ -138,16 +148,31 @@ module Gaffer
 
     def write_local
       remote.each do |file|
-        puts "* local write #{file}"
-        write_file(file, bucket.get(file))
+        puts " * local write #{file}"
+        root_dir[file].parent.create
+        root_dir[file].write bucket.get(file)
       end
     end
 
     def write_remote
       local.each do |file|
-        next if File.directory?("#{@root}/#{file}")
+        next if root_dir[file].dir?
+        new = last_accessed <= root_dir[file].last_accessed
+        next unless new
         puts "* remote write #{file}"
-        bucket.put("#{file}", File.open("#{@root}/#{file}"), {}, file =~ /^ubuntu\/(db|conf)\// ? 'private' : 'public-read')
+        bucket_put file
+      end
+    end
+
+    def bucket_put(file)
+      bucket.put file, root_dir[file].read, {}, remote_perm(file)
+    end
+
+    def remote_perm(file)
+      if file =~ /^index|^ubuntu.db|^ubuntu.conf/
+        'private'
+      else
+        'public-read'
       end
     end
 
@@ -157,7 +182,7 @@ module Gaffer
     end
 
     def local_version
-      File.read("#{@root}/ubuntu/conf/version").to_i rescue 0
+      conf_dir["version"].read.to_i rescue 0
     end
 
     def remote_version
@@ -168,8 +193,32 @@ module Gaffer
       write_version(local_version + 1)
     end
 
+    def root_dir
+      Rush["#{@root}/"]
+    end
+
+    def index_dir
+      root_dir["index/"]
+    end
+
+    def repo_dir
+      root_dir["ubuntu/"]
+    end
+
+    def conf_dir
+      repo_dir["conf/"]
+    end
+
+    def last_accessed
+      Time.at(conf_dir["last_accessed"].read.to_i) rescue Time.at(0)
+    end
+
+    def touch
+      conf_dir["last_accessed"].write Time.now.to_i
+    end
+
     def write_version(version)
-      write_file "ubuntu/conf/version", version.to_s
+      conf_dir["version"].write version.to_s
     end
   end
 end

data/templates/INFO

@@ -0,0 +1,17 @@
+INSTALL 
+
+/var/lib/dpkg/tmp.ci/preinst install 0.0.3-4
+/var/lib/dpkg/info/gaffer.postinst configure 0.0.3-4
+
+UPGRADE
+
+/var/lib/dpkg/info/gaffer.prerm upgrade 0.0.3-4
+/var/lib/dpkg/tmp.ci/preinst upgrade 0.0.3-4
+/var/lib/dpkg/info/gaffer.postrm upgrade 0.0.3-4
+/var/lib/dpkg/info/gaffer.postinst configure 0.0.3-4
+
+REMOVE
+
+/var/lib/dpkg/info/gaffer.prerm remove
+/var/lib/dpkg/info/gaffer.postrm remove
+

data/templates/control.erb

@@ -0,0 +1,11 @@
+Source: <%= package %>
+Section: unknown
+Priority: extra
+Maintainer: <%= maintainer %>
+Version: <%= build_name %>
+Homepage: <%= origin_url %>
+Package: <%= package %>
+Architecture: <%= arch %>
+Depends: <%= depends %>
+Description: <%= description %>
+  <%= readme %>

data/templates/init.erb

@@ -0,0 +1,11 @@
+description     "autogenerated init.conf from gaffer"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+chdir /opt/<%= project %>
+
+exec ./run > /var/log/<%= project %>.log 2>&1
+

data/templates/postinst.erb

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+echo $0 $*
+
+PACKAGE="<%= package %>"
+
+if [ "$1" == "configure" ]; then
+  cd /opt/$PACKAGE
+  if [ -x configure ]; then
+    echo "Running /opt/$PACKAGE/configure"
+    ./configure $*
+  fi
+
+  if [ -f Gemfile ]; then
+    bundle install --deployment
+  fi
+fi	
+
+exit 0
+

data/templates/postrm.erb

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+echo $0 $*
+
+PACKAGE="<%= package %>"
+
+if [ "$1" == "remove" ]; then
+  userdel $PACKAGE
+fi
+
+#if [ "$1" == "upgrade" ]; then
+#fi
+
+exit 0

data/templates/preinst.erb

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+echo $0 $*
+
+PACKAGE="<%= package %>"
+
+if [ "$1" == "install" ]; then
+  echo adding user $PACKAGE
+  useradd $PACKAGE --shell /bin/bash --home /opt/$PACKAGE --create-home
+fi
+
+#if [ "$1" == "upgrade" ]; then
+#fi
+
+exit 0

data/templates/prerm.erb

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+echo $0 $*
+
+PACKAGE="<%= package %>"
+
+#if [ "$1" == "remove" ]; then
+#fi
+
+#if [ "$1" == "upgrade" ]; then
+#fi
+
+exit 0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gaffer
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Orion Henry
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-23 00:00:00 -08:00
+date: 2010-12-13 00:00:00 -08:00
 default_executable: gaffer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,6 +90,13 @@ files:
 - lib/gaffer/base.rb
 - lib/gaffer/deb.rb
 - lib/gaffer/repro.rb
+- templates/INFO
+- templates/control.erb
+- templates/init.erb
+- templates/postinst.erb
+- templates/postrm.erb
+- templates/preinst.erb
+- templates/prerm.erb
 has_rdoc: true
 homepage: http://github.com/orionz/gaffer
 licenses: []