freighthop 0.0.6 → 0.1.0

data/Puppetfile

@@ -5,4 +5,5 @@ mod 'puppetlabs/apt'
 mod 'gdsoperations/rbenv'
 mod 'nginx', :git => 'https://github.com/jfryman/puppet-nginx'
 mod 'puppetlabs/postgresql'
+mod 'puppetlabs/mysql'
 mod 'freighthop', :path => 'local_modules/freighthop'

data/Puppetfile.lock

@@ -5,6 +5,8 @@ FORGE
     puppetlabs/apt (1.2.0)
       puppetlabs/stdlib (>= 2.2.1)
     puppetlabs/firewall (0.4.2)
+    puppetlabs/mysql (2.0.1)
+      puppetlabs/stdlib (>= 2.2.1)
     puppetlabs/postgresql (2.5.0)
       puppetlabs/apt (< 2.0.0, >= 1.1.0)
       puppetlabs/firewall (>= 0.0.4)
@@ -32,6 +34,7 @@ DEPENDENCIES
   gdsoperations/rbenv (>= 0)
   nginx (>= 0)
   puppetlabs/apt (>= 0)
+  puppetlabs/mysql (>= 0)
   puppetlabs/postgresql (>= 0)
   puppetlabs/stdlib (= 4.1.0)
 

data/Vagrantfile

@@ -7,7 +7,7 @@ Vagrant.require_plugin 'landrush'
 
 Vagrant.configure('2') do |config|
   config.vm.box = 'precise64'
-  config.vm.box_url = Freighthop.box_url 
+  config.vm.box_url = Freighthop.box_url
 
   config.landrush.enable
 

data/bin/fh

@@ -1,80 +1,4 @@
 #!/usr/bin/env ruby
 
-FREIGHTHOP_VAGRANT_DOTFILE_PATH = File.expand_path('~/.freighthop.d/vagrant')
-FREIGHTHOP_VAGRANT_CWD          = File.expand_path(File.dirname(__FILE__))
-
-unless File.directory?(FREIGHTHOP_VAGRANT_DOTFILE_PATH)
-  require 'fileutils'
-  FileUtils.mkdir_p(FREIGHTHOP_VAGRANT_DOTFILE_PATH)
-end
-
-ENV['VAGRANT_DOTFILE_PATH'] = FREIGHTHOP_VAGRANT_DOTFILE_PATH
-ENV['VAGRANT_CWD']          = FREIGHTHOP_VAGRANT_CWD
-
-PROJECT_NAME = File.basename(Dir.pwd)
-PROJECT_DIR  = "/srv/#{PROJECT_NAME}"
-
-def print_usage
-  puts <<USAGETEXT
-NAME
-  fh - freighthop's friendly helper
-
-DESCRIPTION
-  The fh command is used to interact with a freighthop-managed vm from the root
-  of your project directory.
-
-SYNOPSIS
-  fh <COMMAND> [args...]
-
-COMMANDS
-  up        - boot freighthop vm
-  halt      - shutdown freighthop vm
-  destroy   - shutdown and delete vm
-  provision - rerun provisioning on a booted freighthop vm
-  reload    - restart freighthop vm (picks up new config changes)
-  status    - check the current status of the freighthop vm
-  ssh       - opens a root shell inside the project dir of the freighthop vm
-  (other)   - see below
-  help      - this help
-
-PASSTHROUGH TO VM
-  Anything that does not match the above list will be passed through to the
-  freighthop vm.
-
-  The command will be run in a bash shell, as root, from inside the shared
-  project directory.
-
-  This allows you to specify relative commands like ./script/server and expect
-  them to behave properly.
-
-EXAMPLES
-  Install gem dependencies:
-    fh bundle install
-
-  Start a Rails 4 server:
-    fh ./bin/rails server
-
-  Run a ruby test:
-    fh ruby -Itest test/unit/object_test.rb
-
-  Install leiningen dependencies:
-    fh lein deps
-
-  Run a ring server:
-    fh lein ring server-headless
-USAGETEXT
-end
-
-subcommand, *rest = ARGV
-case subcommand
-when 'help' then
-  print_usage
-when 'up', 'halt', 'destroy', 'provision', 'reload', 'status' then
-  exec %Q(vagrant #{subcommand} #{rest.join(' ')})
-when 'ssh' then
-  `vagrant ssh-config > /tmp/freighthop.ssh-config`
-  exec %Q(ssh -t -F /tmp/freighthop.ssh-config #{PROJECT_NAME} 'cd #{PROJECT_DIR}; sudo /bin/bash -l -i')
-else
-  `vagrant ssh-config > /tmp/freighthop.ssh-config`
-  exec %Q(ssh -t -F /tmp/freighthop.ssh-config #{PROJECT_NAME} 'cd #{PROJECT_DIR}; sudo /bin/bash -l -c "#{rest.unshift(subcommand).join(' ')}"')
-end
+require 'freighthop'
+Freighthop::CLI.new(*ARGV).run

data/lib/freighthop/cli/help.rb

@@ -0,0 +1,69 @@
+class Freighthop::CLI::Help
+  TOPICS = []
+
+  def self.match?(*args)
+    args.first == 'help' || args.empty?
+  end
+
+  def initialize(*args)
+    _, @topic, *_ = args
+  end
+
+  def run
+    if TOPICS.include?(@topic)
+    else
+      usage
+    end
+  end
+
+  def usage
+    puts <<USAGETEXT
+NAME
+  fh - freighthop's friendly helper
+
+DESCRIPTION
+  The fh command is used to interact with a freighthop-managed vm from the root
+  of your project directory.
+
+SYNOPSIS
+  fh <COMMAND> [args...]
+
+BUILT-IN COMMANDS
+  up        - boot freighthop vm
+  halt      - shutdown freighthop vm
+  destroy   - shutdown and delete vm
+  provision - rerun provisioning on a booted freighthop vm
+  reload    - restart freighthop vm (picks up new config changes)
+  status    - check the current status of the freighthop vm
+  ssh       - opens a root shell inside the project dir of the freighthop vm
+  (other)   - see PASSTHROUGH TO VM below
+  help      - this help
+
+PASSTHROUGH TO VM
+  Anything that does not match the above list will be passed through to the
+  freighthop vm.
+
+  The command will be run in a bash shell, as root, from inside the shared
+  project directory.
+
+  This allows you to specify relative commands like ./script/server and expect
+  them to behave properly.
+
+EXAMPLES
+  Install gem dependencies:
+    fh bundle install
+
+  Start a Rails 4 server:
+    fh ./bin/rails server
+
+  Run a ruby test:
+    fh ruby -Itest test/unit/object_test.rb
+
+  Install leiningen dependencies:
+    fh lein deps
+
+  Run a ring server:
+    fh lein ring server-headless
+USAGETEXT
+  end
+end

data/lib/freighthop/cli/ssh.rb

@@ -0,0 +1,46 @@
+class Freighthop::CLI::SSH
+  def self.match?(*args)
+    !args.empty? # we handle guest passthrough
+  end
+
+  def initialize(*args)
+    @args = args
+  end
+
+  def run
+    if shell?
+      ssh('-i')
+    else
+      ssh(%Q(-c "#{@args.join(' ')}"))
+    end
+  end
+
+  def shell?
+    @args.first == 'ssh'
+  end
+
+  def ssh(cmd)
+    exec %Q(ssh -t -F #{config} #{app_name} 'cd #{guest_root}; sudo /bin/bash -l #{cmd}')
+  end
+
+  def config
+    config_path.tap do |conf|
+      if !conf.exist? || (Time.now - conf.mtime) > 86400
+        `vagrant ssh-config > #{conf}`
+      end
+    end
+  end
+
+  def config_path
+    Pathname("/tmp/freighthop.#{app_name}.ssh-config")
+  end
+
+  def app_name
+    Freighthop.app_name
+  end
+
+  def guest_root
+    Freighthop.guest_root
+  end
+end
+

data/lib/freighthop/cli/vagrant.rb

@@ -0,0 +1,26 @@
+class Freighthop::CLI::Vagrant
+  COMMANDS = %w[
+    up
+    halt
+    destroy
+    provision
+    reload
+    status
+  ]
+
+  def self.match?(*args)
+    COMMANDS.include?(args.first)
+  end
+
+  def initialize(*args)
+    @subcommand, @rest = args
+  end
+
+  def args
+    ([*@rest] || []).join(' ')
+  end
+
+  def run
+    exec %Q(vagrant #{@subcommand} #{args})
+  end
+end

data/lib/freighthop/cli.rb

@@ -0,0 +1,40 @@
+class Freighthop::CLI; end
+
+require_relative 'cli/help'
+require_relative 'cli/ssh'
+require_relative 'cli/vagrant'
+
+class Freighthop::CLI
+  COMMANDS = [
+    Freighthop::CLI::Help,
+    Freighthop::CLI::Vagrant,
+    Freighthop::CLI::SSH,
+  ]
+
+  def initialize(*args)
+    @args = args
+  end
+
+  def run
+    sanity_check
+    Freighthop::VagrantEnv.activate!
+
+    command = COMMANDS.detect(lambda{self.help}) { |c| c.match?(*@args) }
+    command.new(*@args).run
+  end
+
+  def help
+    Freighthop::CLI::Help
+  end
+
+  def sanity_check
+    return if help.match?(*@args)
+    unless Freighthop::Config.exist?
+      puts <<-NO_CONFIG
+ERROR: No freighthop config file (.freighthop.json) found in current path.
+       You probably want to check out the README and/or `fh help`.
+      NO_CONFIG
+      exit 1
+    end
+  end
+end

data/lib/freighthop/config.rb

@@ -1,4 +1,8 @@
 class Freighthop::Config
+  def self.exist?
+    file.exist?
+  end
+
   def self.file
     Freighthop.host_root.join('.freighthop.json')
   end

data/lib/freighthop/vagrant_env.rb

@@ -0,0 +1,24 @@
+class Freighthop::VagrantEnv
+  def self.env
+    {
+      'VAGRANT_DOTFILE_PATH' => vagrant_dotfile_path,
+      'VAGRANT_CWD'          => vagrant_cwd
+    }
+  end
+
+  def self.activate!
+    env.each do |key, val|
+      ENV[key] = val.to_s
+    end
+  end
+
+  def self.vagrant_cwd
+    Freighthop.freighthop_root
+  end
+
+  def self.vagrant_dotfile_path
+    Pathname('~/.freighthop.d/vagrant').expand_path.tap do |path|
+      path.mkpath unless path.directory?
+    end
+  end
+end

data/lib/freighthop/version.rb

@@ -1,3 +1,3 @@
 module Freighthop
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

data/lib/freighthop.rb

@@ -1,10 +1,9 @@
 require 'pathname'
+
 require_relative 'freighthop/version'
 require_relative 'freighthop/config'
-
-unless defined? Vagrant
-  raise "i expect to be required from a Vagrantfile"
-end
+require_relative 'freighthop/cli'
+require_relative 'freighthop/vagrant_env'
 
 module Freighthop
   class << self
@@ -20,6 +19,10 @@ module Freighthop
       Pathname("/srv/#{app_name}")
     end
 
+    def freighthop_root
+      Pathname(File.dirname(__FILE__)).join('..').expand_path
+    end
+
     def app_name
       @app_name ||= host_root.basename.to_s
     end

data/local_modules/freighthop/manifests/database/mysql.pp

@@ -0,0 +1,20 @@
+class freighthop::database::mysql(
+  $db_names,
+  $users,
+) {
+  include mysql::server
+
+  mysql::db{$db_names:
+    user => "notorious",
+    password => "notorious",
+    host => "localhost",
+    grant => ['All']
+  }
+  mysql_grant { $users:
+    ensure     => 'present',
+    options    => ['GRANT'],
+    privileges => ['ALL'],
+    table      => '*.*',
+    user       => 'notorious@%',
+  }
+}

data/local_modules/freighthop/manifests/database/postgres.pp

@@ -1,17 +1,17 @@
 class freighthop::database::postgres(
-  $databases,
-  $database_users,
+  $db_names,
+  $users,
 ) {
   include postgresql::server
 
-  postgresql::pg_hba_rule { 'local-users-get-everything':
+  postgresql::server::pg_hba_rule { 'local-users-get-everything':
     type        => 'local',
     database    => 'all',
     user        => 'all',
     auth_method => 'trust',
     order       => '0001',
   }
-  postgresql::pg_hba_rule { 'local-host-connections-get-everything':
+  postgresql::server::pg_hba_rule { 'local-host-connections-get-everything':
     type        => 'host',
     database    => 'all',
     user        => 'all',
@@ -19,8 +19,8 @@ class freighthop::database::postgres(
     auth_method => 'trust',
     order       => '0001',
   }
-  postgresql::database { $databases: }
-  postgresql::database_user { $database_users:
+  postgresql::server::database { $db_names: }
+  postgresql::server::role { $users:
     superuser     => true,
     createdb      => true,
     createrole    => true,

data/local_modules/freighthop/manifests/database.pp

@@ -1,12 +1,10 @@
 class freighthop::database(
-  $database_flavors,
-  $databases,
-  $database_users
+  $flavors
 ) {
-  if (member($database_flavors, 'postgres')) {
-    class { 'freighthop::database::postgres':
-      databases      => $databases,
-      database_users => $database_users,
-    }
+  if (member($flavors, 'postgres')) {
+    class { 'freighthop::database::postgres':}
+  }
+  if (member($flavors, 'mysql')) {
+    class { 'freighthop::database::mysql':}
   }
 }

data/local_modules/freighthop/manifests/init.pp

@@ -2,9 +2,6 @@ class freighthop(
   $ppas             = $freighthop::params::ppas,
   $packages         = $freighthop::params::packages,
   $languages        = $freighthop::params::languages,
-  $database_flavors = $freighthop::params::database_flavors,
-  $databases        = $freighthop::params::databases,
-  $database_users   = $freighthop::params::database_users,
   $ruby_version     = $freighthop::params::ruby_version,
   $app_name         = $freighthop::params::app_name,
   $app_root         = $freighthop::params::app_root,
@@ -34,9 +31,5 @@ class freighthop(
     ssl_key_path      => $ssl_key_path,
   } ->
 
-  class { 'freighthop::database':
-    database_flavors => $database_flavors,
-    databases        => $databases,
-    database_users   => $database_users,
-  }
+  class { 'freighthop::database':}
 }

data/local_modules/freighthop/manifests/params.pp

@@ -1,7 +1,4 @@
 class freighthop::params {
-  $database_flavors = []
-  $databases        = []
-  $database_users   = []
   $packages         = []
   $ppas             = []
   $languages        = []

data/modules/apt/CHANGELOG

@@ -1,6 +1,16 @@
-## puppetlabs-apt changelog
+2013-10-08 1.4.0
 
-Release notes for the puppetlabs-apt module.
+Summary:
+
+Minor bugfix and allow the timeout to be adjusted.
+
+Features:
+- Add an `updates_timeout` to apt::params
+
+Fixes:
+- Ensure apt::ppa can readd a ppa removed by hand.
+
+Summary
 
 1.3.0
 =====

data/modules/apt/Gemfile

@@ -1,9 +1,12 @@
 source 'https://rubygems.org'
 
 group :development, :test do
-  gem 'rake',                   :require => false
-  gem 'rspec-puppet',           :require => false
-  gem 'puppetlabs_spec_helper', :require => false
+  gem 'rake',                    :require => false
+  gem 'rspec-puppet',            :require => false
+  gem 'puppetlabs_spec_helper',  :require => false
+  gem 'rspec-system',            :require => false
+  gem 'rspec-system-puppet',     :require => false
+  gem 'rspec-system-serverspec', :require => false
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']
@@ -11,5 +14,3 @@ if puppetversion = ENV['PUPPET_GEM_VERSION']
 else
   gem 'puppet', :require => false
 end
-
-# vim:ft=ruby

data/modules/apt/Gemfile.lock

@@ -1,35 +1,70 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    builder (3.2.2)
     diff-lcs (1.2.4)
-    facter (1.7.3)
+    facter (1.6.18)
+    hiera (1.0.0)
+    highline (1.6.19)
+    kwalify (0.7.2)
     metaclass (0.0.1)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    puppet (2.7.23)
-      facter (~> 1.5)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.7.0)
+    nokogiri (1.5.10)
+    puppet (3.0.2)
+      facter (~> 1.6.11)
+      hiera (~> 1.0.0)
     puppetlabs_spec_helper (0.4.1)
       mocha (>= 0.10.5)
       rake
       rspec (>= 2.9.0)
       rspec-puppet (>= 0.1.1)
     rake (10.1.0)
+    rbvmomi (1.6.0)
+      builder
+      nokogiri (>= 1.4.1)
+      trollop
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
+    rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.3)
     rspec-puppet (0.1.6)
       rspec
+    rspec-system (2.3.0)
+      kwalify (~> 0.7.2)
+      net-scp (~> 1.1)
+      net-ssh (~> 2.6)
+      nokogiri (~> 1.5.9)
+      rbvmomi (~> 1.6)
+      rspec (~> 2.13)
+      systemu (~> 2.5)
+    rspec-system-puppet (2.2.0)
+      rspec-system (~> 2.0)
+    rspec-system-serverspec (1.0.1)
+      rspec-system (~> 2.0)
+      serverspec (~> 0.0)
+    serverspec (0.10.5)
+      highline
+      net-ssh
+      rspec (>= 2.13.0)
+    systemu (2.5.2)
+    trollop (2.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  puppet (~> 2.7.0)
+  puppet (~> 3.0.0)
   puppetlabs_spec_helper
   rake
   rspec-puppet
+  rspec-system
+  rspec-system-puppet
+  rspec-system-serverspec

data/modules/apt/Modulefile

@@ -1,5 +1,5 @@
 name    'puppetlabs-apt'
-version '1.3.0'
+version '1.4.0'
 source  'https://github.com/puppetlabs/puppetlabs-apt'
 author  'Evolving Web / Puppet Labs'
 license 'Apache License 2.0'

data/modules/apt/README.md

@@ -54,7 +54,8 @@ The parameters for `apt` are not required in general and are predominantly for d
       proxy_port           => '8080',
       purge_sources_list   => false,
       purge_sources_list_d => false,
-      purge_preferences_d  => false
+      purge_preferences_d  => false,
+      update_timeout       => undef
     }
 
 Puppet will manage your system's `sources.list` file and `sources.list.d` directory but will do its best to respect existing content. 

data/modules/apt/Rakefile

@@ -1 +1,2 @@
 require 'puppetlabs_spec_helper/rake_tasks'
+require 'rspec-system/rake_task'

data/modules/apt/manifests/init.pp

@@ -12,6 +12,8 @@
 #     true, Puppet will purge all unmanaged entries from sources.list
 #   purge_sources_list_d - Accepts true or false. Defaults to false. If set
 #     to true, Puppet will purge all unmanaged entries from sources.list.d
+#   update_timeout - Overrides the exec timeout in seconds for apt-get update.
+#     If not set defaults to Exec's default (300)
 #
 # Actions:
 #
@@ -27,7 +29,8 @@ class apt(
   $proxy_port           = '8080',
   $purge_sources_list   = false,
   $purge_sources_list_d = false,
-  $purge_preferences_d  = false
+  $purge_preferences_d  = false,
+  $update_timeout       = undef
 ) {
 
   include apt::params

data/modules/apt/manifests/ppa.pp

@@ -42,7 +42,7 @@ define apt::ppa(
   exec { "add-apt-repository-${name}":
     environment  => $proxy_env,
     command      => "/usr/bin/add-apt-repository ${options} ${name}",
-    creates      => "${sources_list_d}/${sources_list_d_filename}",
+    unless       => "/usr/bin/test -s ${sources_list_d}/${sources_list_d_filename}",
     logoutput    => 'on_failure',
     notify       => Exec['apt_update'],
     require      => [

data/modules/apt/manifests/update.pp

@@ -5,5 +5,6 @@ class apt::update {
     command     => "${apt::params::provider} update",
     logoutput   => 'on_failure',
     refreshonly => true,
+    timeout     => $apt::update_timeout,
   }
 }