gaffer 0.0.2 → 0.1.0

data/Rakefile

@@ -10,6 +10,9 @@ Jeweler::Tasks.new do |s|
 	s.files = FileList["[A-Z]*", "{bin,default,lib,spec}/**/*"]
 	s.executables = %w(gaffer)
 	s.add_dependency "git"
+	s.add_dependency "right_aws"
+	s.add_dependency "bundler"
+	s.add_dependency "rush"
 end
 
 #Jeweler::RubyforgeTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/bin/gaffer

@@ -4,23 +4,15 @@ require File.dirname(__FILE__) + '/../lib/gaffer'
 
 require 'optparse'
 
-options = { }
+options = {}
 
 optparse = OptionParser.new do|opts|
   opts.banner = <<banner
-Usage: gaffer [options] ...
+Usage: gaffer [options] ACTION [ DIR [ DIR [ ... ] ] ] 
 banner
 
-  opts.on( '-p', '--project NAME', 'Specify a project name.  Default is $DIR.' ) do |project|
-    options[:project] = project
-  end
-
-  opts.on( '-P', '--prefix PREFIX', 'Install prefix.  Default is /opt/$PROJECT/' ) do |prefix|
-    options[:prefix] = prefix
-  end
-
-  opts.on( '-v', '--version VERSION', 'Specify a project name.  Default is $DIR/VERSION' ) do |version|
-    options[:version] = version
+  opts.on( '-f', '--force', 'Force an action' ) do
+    options[:force] = true
   end
 
   opts.on( '-h', '--help', 'Display this screen' ) do
@@ -31,5 +23,26 @@ end
 
 optparse.parse!
 
-Gaffer::Base.new(options).compile
+command = ARGV.shift
+target  = ARGV.shift || Dir::pwd
+
+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
+end
 

data/lib/gaffer.rb

@@ -1,4 +1,9 @@
 require 'tmpdir'
+require 'erb'
 require 'git'
+require 'rush'
+require 'fileutils'
+require 'right_aws'
 require File.dirname(__FILE__) + '/gaffer/base'
 require File.dirname(__FILE__) + '/gaffer/deb'
+require File.dirname(__FILE__) + '/gaffer/repro'

data/lib/gaffer/base.rb

@@ -1,35 +1,85 @@
 module Gaffer
   class Base
-    attr_accessor :dir, :git, :project, :readme, :depends, :version, :prefix, :maintainer, :build
+    attr_accessor :dir, :git, :project, :readme, :depends, :version, :prefix, :maintainer, :build_name
 
     def initialize(options)
-      @dir     = options[:dir] || Dir.pwd
-      @git     = Git.open(@dir)
-      @version = options[:version]
-      @project = options[:project] || File.basename(File.dirname(@git.repo.path))
+      @force = options[:force]
+    end
+
+    def build(dir)
+      @git     = Git::open(dir)
+
+      @project = File::basename(File::dirname(@git.repo.path))
       @maintainer = "#{@git.config["user.name"]} <#{@git.config["user.email"]}>"
-      @prefix  = options[:prefix] || "opt/#{@project}"
+      @prefix  = "opt/#{@project}"
 
-      @git.chdir do
-        @readme = File.read("README") rescue "no README file"
-        @depends = File.read("DEPENDS").chomp rescue "libc6 (>= 2.10)"
-        @version ||= File.read("VERSION").chomp
-      end
+      @readme  = File::read("#{dir}/README") rescue "no README file"
+      @depends = File::read("#{dir}/DEPENDS").chomp rescue "libc6 (>= 2.10)"
+      @version = File::read("#{dir}/VERSION").chomp
+
+      raise "Bad version #{@version}" unless @version =~ /^\d+[.]\d+[.]\d+$/
 
-      puts "======> #{@version.inspect}"
       build_id = @git.tags.map { |a| a.name =~ /^#{@version}-(.+)/; $1.to_i }.sort.last.to_i + 1
-      @build = "#{@version}-#{build_id}"
+      @build_name = "#{@version}-#{build_id}"
 
-      raise "Bad version #{@version}" unless @version =~ /^\d+[.]\d+[.]\d+$/
-    end
+      puts "======> #{@version.inspect}"
 
-    def compile
-      @git.add_tag(@build)
+      @git.add_tag(@build_name)
       ## check version - tag repo
-      [ "i386", "amd64" ].each do |arch|
-        Gaffer::Deb.new(self, arch, project,          depends).compile
-        Gaffer::Deb.new(self, arch, "#{project}-dev", "#{project} (>= #{@version})").compile
+
+      Gaffer::Deb::new(self, project, depends).build
+#      Gaffer::Deb::new(self, "#{project}-dev", "#{project} (>= #{@version})").build
+    end
+
+    def add(file)
+      file = File.expand_path(file)
+      Dir.chdir(repro_dir) do
+        repro.include(file)
       end
     end
+
+    def push_changed(dir, &blk)
+      # I can optimze later
+      start = Time::now
+      Dir.chdir(dir) do
+        blk.call
+        Dir["**/*"].select { |file| File::stat(file).mtime >= start }.each do |file|
+          puts "PUSHING: #{f}"
+        end
+      end
+    end
+ 
+    def repro
+      options = {}
+
+      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[:key]        ||= options[:email]
+
+      options[:codename]   ||= "maverick"
+      options[:components] ||= "main"
+      options[:force]      ||= !!@force
+
+      dir = repro_dir
+
+      puts "Repo: #{dir}"
+
+      Gaffer::Repro.new(dir, options)
+    end
+
+    def repro_dir
+      if ENV['HOME']
+        "#{ENV['HOME']}/.gaffer/repo"
+      else
+        "/var/lib/gaffer/repo"
+      end
+    end
+
+    def repro_ready?
+      File.exists? "#{repro_dir}/ubuntu/conf/distributions"
+    end
   end
 end

data/lib/gaffer/deb.rb

@@ -1,66 +1,83 @@
 module Gaffer
   class Deb
-    def initialize(base, arch, package, depends)
+    attr_accessor :package, :readme, :depends, :arch
+
+    def initialize(base, _package, _depends)
       @base = base
-      @arch = arch
-      @package = package
-      @depends = depends
+      @arch = "all"
+      @package = _package
+      @depends = _depends
       @dev = !!(@package =~ /-dev$/)
     end
 
-    def compile
-      puts self.inspect
+    def build
       Dir.mktmpdir do |dir|
         install_dir = "#{dir}/#{@base.prefix}"
         Git.clone(@base.dir, install_dir)
-        system "mkdir #{dir}/DEBIAN"
-        puts control
+        Rush.bash "mkdir #{dir}/DEBIAN"
         File.open("#{dir}/DEBIAN/control", "w") do |f|
           f.write(control)
         end
+        puts control
         if @dev
-          system "find #{install_dir} | grep -v [.]git | grep -v #{install_dir}$ | xargs rm -rf"
+          Rush.bash "find #{install_dir} | grep -v [.]git | grep -v #{install_dir}$ | xargs rm -rf"
         else
-          system "rm -rf #{install_dir}/.git"
-          [ "preinst", "postinst", "prerm", "postrm" ].each do |script|
-            system "cp #{@base.dir}/#{script} #{dir}/DEBIAN/" if File.exists?("#{@base.dir}/#{script}")
-          end
-          if File.exists?("#{@base.dir}/init.conf")
+          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"
-            system "mkdir -p #{dir}/etc/init"
-            system "cp #{@base.dir}/init.conf #{dir}/etc/init/#{@base.project}.conf"
+            Rush.bash "mkdir -p #{dir}/etc/init"
+            Rush.bash "cp #{@base.dir}/init.conf #{dir}/etc/init/#{@base.project}.conf"
+          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
+            end
           end
         end
-        system "dpkg-deb -b #{dir} ./#{filebase}.deb"
+        Rush.bash "dpkg-deb -b #{dir} ./#{filebase}.deb"
+        File.expand_path("./#{filebase}.deb")
       end
     end
 
+    def has_init?
+      File.exists?("#{@base.dir}/init.conf")
+    end
+
     def origin_url
       @base.git.remotes.select { |r| r.name == "origin" }.map { |r| r.url }.first
     end
 
     def description
-      "Gaffer package #{@package} #{@base.build}"
+      "Gaffer package #{package} #{build_name}"
     end
 
     def filebase
-        "#{@package}_#{@base.build}_#{@arch}"
+        "#{package}_#{build_name}_#{@arch}"
+    end
+
+    def template(type)
+      ERB.new(File.read("#{File.dirname(__FILE__)}/../../templates/#{type}.erb")).result(binding)
+    end
+
+    def maintainer
+      @base.maintainer
+    end
+
+    def build_name
+      @base.build_name
     end
 
     def control
-      <<CONTROL
-Source: #{@package}
-Section: unknown
-Priority: extra
-Maintainer: #{@base.maintainer}
-Version: #{@base.build}
-Homepage: #{origin_url}
-Package: #{@package}
-Architecture: #{@arch}
-Depends: #{@depends}
-Description: #{description}
-  #{@readme}
-CONTROL
+      template(:control)
     end
   end
 end

data/lib/gaffer/repro.rb

@@ -0,0 +1,175 @@
+module Gaffer
+  class Repro
+
+    def initialize(root, options = {})
+      @root       = root
+      @maintainer = options[:maintainer]
+      @email      = options[:email]
+      @key        = options[:key]
+      @force      = options[:force]
+      @codename   = options[:codename]
+      @components = options[:components]
+      @bucket     = options[:bucket]
+      @aws_key    = options[:aws_key]
+      @aws_secret = options[:aws_secret]
+    end
+
+    def init
+      if not Dir[@root].empty?
+        raise "Dir #{@root} not empty - cannot init" unless @force
+        FileUtils.rm_rf @root
+      end
+      create_dirs
+      write_file "ubuntu/conf/options", options
+      write_file "ubuntu/conf/distributions", distributes
+      write_version 1
+    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
+      end
+    end
+
+    def include(file)
+      bump_version
+      file = File.expand_path(file)
+      Dir.chdir("#{@root}/ubuntu") do
+        run "reprepro includedeb #{@codename} #{file}"
+      end
+    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
+
+    def push
+      raise "Remote version #{remote_version} is higher than local #{local_version}.  Use --force to override" if (remote_version > local_version && !@force)
+      puts "Version: #{local_version}"
+      delete_remote
+      write_remote
+      puts " [apt source]"
+      puts url
+      puts ""
+    end
+
+    def pull
+      raise "Local version #{local_version} is higher than local #{remote_version}.  Use --force to override" if (remote_version < local_version && !@force)
+      create_dirs
+      puts "Version: #{remote_version}"
+      delete_local
+      write_local
+    end
+
+    def url
+      "deb http://#{@bucket}.s3.amazonaws.com/ubuntu/ #{@codename} #{@components}"
+    end
+
+    private
+
+    def repo_dirs
+      %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"
+      d << "basedir ."
+      d.join("\n") + "\n"
+    end
+
+    def distributes
+      d = []
+      d << "Origin: #{@maintainer}"
+      d << "Label: #{@maintainer} Deploy Repo"
+      d << "Codename: #{@codename}"
+      d << "Architectures: i386 amd64 source"
+      d << "Components: #{@components}"
+      d << "Description: Deploy repo for #{@maintainer}"
+      d << "SignWith: #{@key}" if @key
+      d.join("\n") + "\n"
+    end
+
+    def run(cmd)
+      Dir.chdir("#{@root}/ubuntu") do
+        puts "DEBUG: #{cmd}"
+        system(cmd) || (raise "Commmand failed: #{cmd}")
+      end
+    end
+
+    def s3
+      raise "Need aws key and secret to use s3" if @aws_key.nil? or @aws_secret.nil?
+      @s3 ||= RightAws::S3.new(@aws_key, @aws_secret, :logger => Logger.new(nil))
+    end
+
+    def remote
+      bucket.keys('prefix' => 'ubuntu').map { |k| k.to_s }
+    end
+
+    def local
+      Dir.chdir(@root) do
+         Dir["**/*"].reject { |f| File.directory?(f) }
+      end
+    end
+
+    def delete_local
+      (local - remote).each do |file|
+        puts "* local delete #{file}"
+        File.delete("#{@root}/#{file}")
+      end
+    end
+
+    def delete_remote
+      (remote - local).each do |file|
+        puts "* remote delete #{file}"
+        bucket.delete(file)
+      end
+    end
+
+    def write_local
+      remote.each do |file|
+        puts "* local write #{file}"
+        write_file(file, bucket.get(file))
+      end
+    end
+
+    def write_remote
+      local.each do |file|
+        next if File.directory?("#{@root}/#{file}")
+        puts "* remote write #{file}"
+        bucket.put("#{file}", File.open("#{@root}/#{file}"), {}, file =~ /^ubuntu\/(db|conf)\// ? 'private' : 'public-read')
+      end
+    end
+
+    def bucket
+        raise "bucket not set" unless @bucket
+        s3.bucket(@bucket, true)
+    end
+
+    def local_version
+      File.read("#{@root}/ubuntu/conf/version").to_i rescue 0
+    end
+
+    def remote_version
+      bucket.get("ubuntu/conf/version").to_i rescue 0
+    end
+
+    def bump_version
+      write_version(local_version + 1)
+    end
+
+    def write_version(version)
+      write_file "ubuntu/conf/version", version.to_s
+    end
+  end
+end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Orion Henry
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 -07:00
+date: 2010-11-23 00:00:00 -08:00
 default_executable: gaffer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,48 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: right_aws
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rush
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: Duct tape together some debian packages
 email: orion@heroku.com
 executables: 
@@ -47,13 +89,14 @@ files:
 - lib/gaffer.rb
 - lib/gaffer/base.rb
 - lib/gaffer/deb.rb
+- lib/gaffer/repro.rb
 has_rdoc: true
 homepage: http://github.com/orionz/gaffer
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement