freighthop 0.0.3 → 0.0.4

data/lib/freighthop/config.rb

@@ -1,6 +1,6 @@
 class Freighthop::Config
   def self.file
-    Freighthop.root.join('.freighthop.json')
+    Freighthop.host_root.join('.freighthop.json')
   end
 
   def self.config

data/lib/freighthop/version.rb

@@ -1,3 +1,3 @@
 module Freighthop
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/freighthop.rb

@@ -21,7 +21,7 @@ module Freighthop
     end
 
     def app_name
-      @app_name ||= host_rails_root.basename.to_s
+      @app_name ||= host_root.basename.to_s
     end
 
     def hostname
@@ -43,8 +43,8 @@ module Freighthop
     def mounts
       Freighthop::Config.fetch("freighthop::mounts").map do |host, guest|
         [
-          File.expand_path(host_rails_root.join(host)),
-          File.expand_path(guest_rails_root.join(guest)),
+          File.expand_path(host_root.join(host)),
+          File.expand_path(guest_root.join(guest)),
         ]
       end
     end

data/local_modules/freighthop/manifests/init.pp

@@ -1,7 +1,8 @@
 class freighthop(
   $databases,
   $database_users,
-  $packages        = ['git-core'],
+  $packages        = $freighthop::params::packages,
+  $ppas            = $freighthop::params::ppas,
   $ruby_version    = $freighthop::params::ruby_version,
   $app_name        = $freighthop::params::app_name,
   $app_root        = $freighthop::params::app_root,
@@ -13,6 +14,9 @@ class freighthop(
 ) inherits freighthop::params {
   include apt
 
+  class { 'freighthop::ppas':
+    ppas => $ppas,
+  } ->
   class { 'freighthop::pkgs':
     packages => $packages,
   } ->

data/local_modules/freighthop/manifests/params.pp

@@ -1,4 +1,6 @@
 class freighthop::params {
+  $packages        = ['git-core']
+  $ppas            = []
   $ruby_version    = '1.9.3-p392'
   $app_name        = $::hostname
   $app_root        = "/srv/${app_name}"

data/local_modules/freighthop/manifests/ppas.pp

@@ -0,0 +1,9 @@
+class freighthop::ppas(
+  $ppas
+) {
+  # required ppas
+  apt::ppa { 'ppa:gds/govuk': }
+  apt::ppa { 'ppa:phinze/rbenv': }
+
+  apt::ppa { $ppas: }
+}

data/local_modules/freighthop/manifests/rbenv.pp

@@ -1,12 +1,8 @@
 class freighthop::rbenv(
   $ruby_version
 ) {
-  apt::ppa { 'ppa:gds/govuk': }
-  apt::ppa { 'ppa:phinze/rbenv': }
-
   class { '::rbenv':
     global_version => $ruby_version,
-    require        => Apt::Ppa['ppa:gds/govuk'],
   }
 
   rbenv::version { $ruby_version: }

data/modules/freighthop/manifests/init.pp

@@ -1,7 +1,8 @@
 class freighthop(
   $databases,
   $database_users,
-  $packages        = ['git-core'],
+  $packages        = $freighthop::params::packages,
+  $ppas            = $freighthop::params::ppas,
   $ruby_version    = $freighthop::params::ruby_version,
   $app_name        = $freighthop::params::app_name,
   $app_root        = $freighthop::params::app_root,
@@ -13,6 +14,9 @@ class freighthop(
 ) inherits freighthop::params {
   include apt
 
+  class { 'freighthop::ppas':
+    ppas => $ppas,
+  } ->
   class { 'freighthop::pkgs':
     packages => $packages,
   } ->

data/modules/freighthop/manifests/params.pp

@@ -1,4 +1,6 @@
 class freighthop::params {
+  $packages        = ['git-core']
+  $ppas            = []
   $ruby_version    = '1.9.3-p392'
   $app_name        = $::hostname
   $app_root        = "/srv/${app_name}"

data/modules/freighthop/manifests/ppas.pp

@@ -0,0 +1,9 @@
+class freighthop::ppas(
+  $ppas
+) {
+  # required ppas
+  apt::ppa { 'ppa:gds/govuk': }
+  apt::ppa { 'ppa:phinze/rbenv': }
+
+  apt::ppa { $ppas: }
+}

data/modules/freighthop/manifests/rbenv.pp

@@ -1,12 +1,8 @@
 class freighthop::rbenv(
   $ruby_version
 ) {
-  apt::ppa { 'ppa:gds/govuk': }
-  apt::ppa { 'ppa:phinze/rbenv': }
-
   class { '::rbenv':
     global_version => $ruby_version,
-    require        => Apt::Ppa['ppa:gds/govuk'],
   }
 
   rbenv::version { $ruby_version: }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freighthop
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,6 +141,7 @@ files:
 - local_modules/freighthop/manifests/params.pp
 - local_modules/freighthop/manifests/pkgs.pp
 - local_modules/freighthop/manifests/postgres.pp
+- local_modules/freighthop/manifests/ppas.pp
 - local_modules/freighthop/manifests/rbenv.pp
 - local_modules/freighthop/manifests/redis.pp
 - local_modules/freighthop/templates/nginx/vagrant-rails.conf.erb
@@ -270,6 +271,7 @@ files:
 - modules/freighthop/manifests/params.pp
 - modules/freighthop/manifests/pkgs.pp
 - modules/freighthop/manifests/postgres.pp
+- modules/freighthop/manifests/ppas.pp
 - modules/freighthop/manifests/rbenv.pp
 - modules/freighthop/manifests/redis.pp
 - modules/freighthop/templates/nginx/vagrant-rails.conf.erb
@@ -656,7 +658,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3310240632279879997
+      hash: -3032814133313184341
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -665,7 +667,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3310240632279879997
+      hash: -3032814133313184341
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23