engineyard-local 0.2.1 → 1.0.1

data/lib/engineyard-local/command/update.rb

@@ -0,0 +1,42 @@
+module Engineyard
+  module Local
+    module Command
+      class Update < Base
+
+        def exec(*args)
+          installed_cookbook_version = []
+          la_brea_data = []
+          run( Vagrant::Action::Builder.new do
+            use( Engineyard::Local::Middleware::Cookbooks,:get_installed_version, installed_cookbook_version )
+            use( Engineyard::Local::Middleware::Cookbooks,:get_la_brea_data, la_brea_data )
+          end )
+
+          installed_cookbook_version = installed_cookbook_version.first
+          la_brea_data = la_brea_data.first
+
+          if ( installed_cookbook_version == la_brea_data[:cookbooks_version] )
+            @env.ui.info I18n.t("eylocal.update.nothing")
+          else
+            @env.ui.info I18n.t("eylocal.update.updating")
+
+            new_cookbook_version = []
+            run( Vagrant::Action::Builder.new do
+              use( Engineyard::Local::Middleware::Cookbooks,:update_cookbooks )
+              use( Engineyard::Local::Middleware::Cookbooks,:get_installed_version, new_cookbook_version )
+            end )
+            new_cookbook_version = new_cookbook_version.first
+
+            if (installed_cookbook_version == new_cookbook_version)
+              @env.ui.info I18n.t("eylocal.update.fail")
+            else
+              @env.ui.info I18n.t("eylocal.update.success")
+              run Engineyard::Local::Command::Up.setup_stack(options)
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/engineyard-local/middleware.rb

@@ -5,6 +5,7 @@ require "engineyard-local/middleware/rails"
 require "engineyard-local/middleware/exec"
 require "engineyard-local/middleware/tag"
 require "engineyard-local/middleware/network"
+require "engineyard-local/middleware/cookbooks"
 require "engineyard-local/middleware/default_provisioner"
 
 # alter some of the core vagrant middleware stacks to make sure

data/lib/engineyard-local/middleware/bundle.rb

@@ -23,6 +23,7 @@ module Engineyard
               "cd #{project_dir}",
               "sudo mkdir -p #{project_dir} /data/#{Engineyard::Local.config['app_name']}/",
               "if [[ ! -e /data/#{Engineyard::Local.config['app_name']}/current ]]; then sudo ln -sf #{project_dir} /data/#{Engineyard::Local.config['app_name']}/current; fi",
+              "if [[ ! -e /data/#{Engineyard::Local.config['app_name']}/current/public ]]; then sudo mkdir -p /data/#{Engineyard::Local.config['app_name']}/current/public; fi",
               if_gemfile_exists("sudo bundle install")
             ]
         end

data/lib/engineyard-local/middleware/chef.rb

@@ -2,6 +2,7 @@ module Engineyard
   module Local
     module Middleware
       class Chef
+        include Middleware::Helpers::Uploadable
         include Middleware::Helpers::Executable
         include Middleware::Helpers::Rvm
 
@@ -12,22 +13,38 @@ module Engineyard
 
         def call(env)
           @env[:ui].info I18n.t("eylocal.setup.chef")
+          copy_patches(env)
           ssh_exec!(env, commands)
           @app.call(env)
         end
 
+        def cached_data_path
+          "#{@env[:root_path]}/.ey_local_data"
+        end
+
+        def copy_patches(env)
+          patchdir = "/tmp/eylocal_patches"
+          ssh_exec!(env, ["mkdir -p #{patchdir}"])
+
+          Local.config[:box_defaults][:patches].each do |p|
+            from = File.expand_path("config/patches/#{p}", Engineyard::Local.project_root)
+            ssh_upload!(env, from, File.join(patchdir,p))
+          end
+        end
+
         def commands
           rvm_env +
           [
             ensure_that_recipes_are_installed,
             "cd /etc/chef",
             "sudo env PATH=/usr/local/ey_resin/bin:/sbin:/bin:/usr/sbin:/usr/bin chef-solo -j /etc/chef/dna.json -c /etc/chef/solo.rb",
+            "if [[ ! -e /usr/bin/rake ]]; then sudo ln -s /usr/bin/rake19 /usr/bin/rake; fi",
             run_custom_chef_in_application_if_it_exists
           ]
         end
 
         def ensure_that_recipes_are_installed
-          "if [[ ! -d /etc/chef/recipes ]]; then curl -s #{cookbook_uri} > /tmp/chef.tar.bz2; sudo mkdir -p /etc/chef/recipes && cd /etc/chef/recipes && sudo tar -xjf /tmp/chef.tar.bz2; rm /tmp/chef.tar.bz2; fi"
+          "if [[ ! -d /etc/chef/recipes ]]; then curl -s #{cookbook_uri} > /tmp/chef.tar#{cookbook_suffix}; sudo mkdir -p /etc/chef/recipes && cd /etc/chef/recipes && sudo tar #{tar_flags} /tmp/chef.tar#{cookbook_suffix}; sudo patch -p1 < /tmp/eylocal_patches/* >& /dev/null; sudo touch #{Engineyard::Local::Middleware::Cookbooks::COOKBOOK_VERSION_FILE}; sudo chown vagrant #{Engineyard::Local::Middleware::Cookbooks::COOKBOOK_VERSION_FILE}; echo \"#{cookbook_version}\" > #{Engineyard::Local::Middleware::Cookbooks::COOKBOOK_VERSION_FILE}; rm /tmp/chef.tar#{cookbook_suffix}; fi"
         end
 
         def run_custom_chef_in_application_if_it_exists
@@ -35,7 +52,40 @@ module Engineyard
         end
 
         def cookbook_uri
-          Local.config[:box_defaults][:cookbook_uri]
+          ey_local_data = nil
+          if ( !@cookbook_uri && File.exist?( cached_data_path ) )
+            ey_local_data = YAML.load( File.read( cached_data_path ) )
+          end
+          @la_brea_data ||= ey_local_data ? ey_local_data[:la_brea_data] : nil
+          @cookbook_uri ||= ( ey_local_data && ey_local_data[:la_brea_data][:cookbooks_url] ) ?
+            ey_local_data[:la_brea_data][:cookbooks_url] : Local.config[:box_defaults][:cookbook_uri]
+        end
+
+        def cookbook_suffix
+          cookbook_uri =~ /\.(\w+)$/
+          case $1
+          when /bz2|tbz/
+            ".bz2"
+          when /gz|tgz/
+            ".gz"
+          else
+            ""
+          end
+        end
+
+        def tar_flags
+          case cookbook_suffix
+          when /bz2|tbz/
+            "-xjf"
+          when /gz|tgz/
+            "-xzf"
+          else
+            "-xf"
+          end
+        end
+
+        def cookbook_version
+          ( @la_brea_data && @la_brea_data[:cookbooks_version] ) ? @la_brea_data[:cookbooks_version] : Local.config[:box_defaults][:cookbook_version]
         end
 
       end

data/lib/engineyard-local/middleware/cookbooks.rb

@@ -0,0 +1,111 @@
+require 'open-uri'
+
+module Engineyard
+  module Local
+    module Middleware
+      class Cookbooks
+        include Middleware::Helpers::Executable
+        include Middleware::Helpers::Rvm
+        extend Middleware::Helpers::Executable
+
+        DATA_EXPIRATION = 600
+        COOKBOOK_VERSION_FILE = "/etc/chef/ey_local_cookbook_version"
+
+        def cookbook_query_commands
+          [
+            "cat #{COOKBOOK_VERSION_FILE}"
+          ]
+        end
+
+        def initialize(app, env, *args)
+          @app = app
+          @env = env
+          @args = args
+        end
+
+        def cached_data_path
+          "#{@env[:root_path]}/.ey_local_data"
+        end
+
+        def call(env)
+          cmd,response = @args
+
+          if File.exist?(cached_data_path)
+            ey_local_data = YAML.load(File.read(cached_data_path))
+          else
+            ey_local_data = {
+              :installed_cookbook_version => {
+                :data => nil,
+                :as_of => Time.at(1)
+              },
+              :la_brea_data => {
+                :changelog => nil,
+                :cookbooks_url => nil,
+                :cookbooks_version => nil,
+                :created_at => nil,
+                :updated_at => nil,
+                :uuid => nil,
+                :as_of => Time.at(1)
+              }
+            }
+          end
+          
+          case cmd
+          when :get_installed_version
+            get_installed_cookbook_version(ey_local_data)
+            response << ey_local_data[:installed_cookbook_version][:data]
+
+          when :get_la_brea_data
+            get_la_brea_data(ey_local_data)
+            response << ey_local_data[:la_brea_data]
+
+          when :update_cookbooks
+            get_la_brea_data(ey_local_data)
+
+            ssh_exec!(@env, update_cookbook_commands(
+              ey_local_data[:la_brea_data][:cookbooks_url],
+              ey_local_data[:la_brea_data][:cookbooks_version]))
+            get_installed_cookbook_version(ey_local_data, true)
+          end
+
+          @app.call(env)
+        end
+
+        def get_installed_cookbook_version(ey_local_data, force = false)
+          if ( force || ( Time.now > ( ey_local_data[:installed_cookbook_version][:as_of] + DATA_EXPIRATION ) ) )
+            cmd_output = ssh_exec(@env, cookbook_query_commands, {:error_check => false})
+            ey_local_data[:installed_cookbook_version][:data] = cmd_output[:stdout] ? cmd_output[:stdout].join.chomp : nil
+            ey_local_data[:installed_cookbook_version][:as_of] = Time.now
+            write_cached_data(ey_local_data)
+          end
+        end
+
+        def get_la_brea_data(ey_local_data)
+          if ( Time.now > ( ey_local_data[:la_brea_data][:as_of] + DATA_EXPIRATION ) )
+            r = YAML.load(open("http://#{Engineyard::Local.config[:la_brea_bridge]}/stack")) rescue nil
+            if r
+              r[:as_of] = Time.now
+              ey_local_data[:la_brea_data] = r
+              write_cached_data(ey_local_data)
+            end
+          end
+        end
+
+        def write_cached_data(ey_local_data)
+          File.open(cached_data_path, "w+") {|fh| fh.write YAML.dump(ey_local_data)}
+        end
+
+        def update_cookbook_commands(cookbook_uri, cookbook_version)
+          rvm_env +
+          [
+            "curl -s #{cookbook_uri} > /tmp/_chef.tgz",
+            "sudo mkdir -p /etc/chef/recipes && cd /etc/chef/recipes && sudo tar -xzf /tmp/_chef.tgz",
+            "if (( ! $? )); then sudo chown \`whoami\` #{COOKBOOK_VERSION_FILE}; echo \"#{cookbook_version}\" > #{COOKBOOK_VERSION_FILE}; fi",
+            "rm /tmp/_chef.tgz"
+          ]
+        end
+
+      end
+    end
+  end
+end

data/lib/engineyard-local/middleware/dna.rb

@@ -45,8 +45,10 @@ module Engineyard
 
         def commands
             [
-              "sudo mv #{solo_tmp_to} #{solo_to}",
-              "sudo mv #{dna_tmp_to} #{dna_to}",
+              # Windows slashes are eliminated when these commands are
+              # passed, so we need to ensure they are correctly escaped.
+              "sudo mv #{solo_tmp_to.gsub("\\","\\\\\\")} #{solo_to}",
+              "sudo mv #{dna_tmp_to.gsub("\\","\\\\\\")} #{dna_to}",
             ]
         end
 
@@ -55,7 +57,7 @@ module Engineyard
         end
 
         def dna_tmp_to
-          "/tmp/dna.json.#{$$}"
+          File.join(Engineyard::Local.tmp_dir,"dna.json.#{$$}")
         end
 
         def dna_to
@@ -67,7 +69,7 @@ module Engineyard
         end
 
         def solo_tmp_to
-          "/tmp/solo.rb.#{$$}"
+          File.join(Engineyard::Local.tmp_dir,"solo.rb.#{$$}")
         end
 
         def solo_to

data/lib/engineyard-local/middleware/exec.rb

@@ -15,7 +15,8 @@ module Engineyard
         end
 
         def commands
-          rvm_env + [ "cd #{project_dir}", command_args ]
+          rvm_env +
+            [ "cd #{project_dir}", command_args ]
         end
 
         def command_args

data/lib/engineyard-local/middleware/helpers/executable.rb

@@ -9,13 +9,25 @@ module Engineyard
 
             env[:vm].channel.execute(commands) do |stream, data|
               if stream == :stdout
-                env[:vm].ui.info(data.strip)
+                env[:vm].ui.info(data.strip, opts)
               else
-                env[:vm].ui.error(data.strip)
+                env[:vm].ui.error(data.strip, opts)
               end
             end
           end
 
+          def ssh_exec(env, bash_commands, opts = {})
+            commands = bash_commands.join(";\n")
+
+            r = Hash.new {|h,k| h[k] = []}
+
+            env[:vm].channel.execute(commands, opts) do |stream, data|
+              r[stream] << data
+            end
+
+            r
+          end
+
           # TODO might belong in a general helpers mixin
           def project_dir
             @env[:vm].config.vm.shared_folders["v-root"][:guestpath]

data/lib/engineyard-local/middleware/network.rb

@@ -19,17 +19,17 @@ module Engineyard
             # if the proposed ip matches a different vms tagged ip
             # let the user decide if this is intended or needs to be fixed
             if(!@options[:silent] && existing_ip == proposed_ip)
-              while !["Y", "N"].include?(result ||= nil)
+              while !["Y","y","N","n"].include?(result ||= nil)
                 result = check_with_user(name)
               end
 
-              if result == "N"
+              if result.upcase == "N"
                 raise(Errors::PossibleIPCollision,
                       :proposed_ip => proposed_ip,
                       :vm_name => name)
               end
 
-              if result == "Y"
+              if result.upcase == "Y"
                 break
               end
             end

data/lib/engineyard-local/middleware/rails.rb

@@ -1,3 +1,4 @@
 require "engineyard-local/middleware/rails/db"
+require "engineyard-local/middleware/rails/assets"
 require "engineyard-local/middleware/rails/command"
 require "engineyard-local/middleware/rails/install"

data/lib/engineyard-local/middleware/rails/assets.rb

@@ -0,0 +1,35 @@
+module Engineyard
+  module Local
+    module Middleware
+      module Rails
+        class Assets
+          include Middleware::Helpers::Rvm
+          include Middleware::Helpers::Executable
+
+          def initialize(app, env)
+            @app = app
+            @env = env
+          end
+
+          def call(env)
+            @env[:ui].info I18n.t("eylocal.setup.rails.assets")
+            ssh_exec!(env, commands)
+            @app.call(env)
+          end
+
+          def commands
+              [ "cd #{project_dir}",
+                if_task_exists("assets:precompile"),
+                "sudo /etc/init.d/nginx restart" ]
+          end
+
+          # if there's a Rakefile, and rake -T contains the task we're looking for
+          # execute the task
+          def if_task_exists(task)
+            "if [[ `rake -T > /dev/null 2>&1 && rake -T | grep -e '#{task}'` ]]; then rake #{task}; fi"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/engineyard-local/middleware/rails/command.rb

@@ -16,7 +16,7 @@ module Engineyard
           end
 
           def commands
-            rvm_env +
+            #rvm_env +
               [ "cd #{project_dir}",
                 "rails #{command_args}" ]
           end

data/lib/engineyard-local/middleware/rails/db.rb

@@ -18,7 +18,6 @@ module Engineyard
           end
 
           def commands
-            rvm_env +
               [ "cd #{project_dir}",
                 if_task_exists("db:create"),
                 if_task_exists("db:migrate") ]

data/lib/engineyard-local/middleware/rails/new.rb

@@ -16,7 +16,7 @@ module Engineyard
           end
 
           def commands
-            rvm_env +
+            #rvm_env +
               [ "cd #{project_dir}",
                 "rails #{command_args}" ]
           end

data/lib/engineyard-local/version.rb

@@ -1,5 +1,5 @@
 module Engineyard
   module Local
-    VERSION = "0.2.1"
+    VERSION = "1.0.1"
   end
 end

data/test/engineyard-local/command/up_test.rb

@@ -16,6 +16,7 @@ class CommandUpTest < Test::Unit::TestCase
       # prevent the bundle middleware from executing
       @klass.any_instance.stubs(:with_target_vms).returns([])
       @klass.any_instance.stubs(:env).returns(@env)
+      @klass.any_instance.stubs(:pwd_matches_root_path).returns(true)
 
       @env.stubs(:cli)
       @env.stubs(:root_path).returns(nil)

data/test/integration/commands_test.rb

@@ -0,0 +1,30 @@
+require "test_helper"
+
+module Integration
+  class CommandsTest < Test::Unit::TestCase
+    include Engineyard::Local::TestHelpers::Integration
+
+    def setup
+      Dir.chdir(ensure_test_directory)
+      fail_on_stderr
+      clean_env
+    end
+
+    # TODO cramming it all in here to ensure sequence
+    should "up completes as do dependent commands" do
+      assert_cmd("ey-local up --silent")
+      assert(`ey-local list` != "", "the output should not be empty")
+      assert(`ey-local exec echo "foo"`.include?("foo"), "output should include the echo value")
+
+      log_setup
+      assert(`ey-local log`.strip == "dev", "log output default should come from dev log without prefix")
+      assert(`ey-local log --environment=production`.strip == "prod", "log output default should come from dev log without prefix")
+      assert_cmd("ey-local destroy -f")
+    end
+
+    def log_setup
+      `echo "dev" > log/development.log`
+      `echo "prod" > log/production.log`
+    end
+  end
+end