tenderloin 0.2.0 → 0.3.0

data/config/default.rb

@@ -16,11 +16,9 @@ Tenderloin::Config.run do |config|
   config.package.name = 'tenderloin'
   config.package.extension = '.box'
 
-  config.chef.enabled = false
-  config.chef.cookbooks_path = "cookbooks"
-  config.chef.provisioning_path = "/tmp/tenderloin-chef"
-  config.chef.json = {
-    :instance_role => "tenderloin",
-    :recipes => ["tenderloin_main"]
-  }
+  config.provisioning.script = nil
+  config.provisioning.command = nil
+
+  config.shared_folders.enabled = true
+  config.shared_folders.folders = []
 end

data/lib/tenderloin/actions/vm/provision.rb

@@ -3,54 +3,25 @@ module Tenderloin
     module VM
       class Provision < Base
         def execute!
-          chown_provisioning_folder
-          setup_json
-          setup_solo_config
-          run_chef_solo
+          setup_script if Tenderloin.config.provisioning.script
+          run_command if Tenderloin.config.provisioning.command
         end
 
-        def chown_provisioning_folder
-          logger.info "Setting permissions on provisioning folder..."
-          SSH.execute do |ssh|
-            ssh.exec!("sudo chown #{Tenderloin.config.ssh.username} #{Tenderloin.config.chef.provisioning_path}")
-          end
-        end
-
-        def setup_json
-          logger.info "Generating JSON and uploading..."
-
-          # Set up initial configuration
-          data = {
-            :config => Tenderloin.config,
-            :directory => Tenderloin.config.vm.project_directory,
-          }
-
-          # And wrap it under the "tenderloin" namespace
-          data = { :tenderloin => data }
-
-          # Merge with the "extra data" which isn't put under the
-          # tenderloin namespace by default
-          data.merge!(Tenderloin.config.chef.json)
+        def setup_script
+          logger.info "Uploading provisioning script..."
 
-          json = data.to_json
+          SSH.upload!(@runner.fusion_vm.ip, StringIO.new(Tenderloin.config.provisioning.script), File.join('/tmp', "tenderloin_provision.sh"))
 
-          SSH.upload!(StringIO.new(json), File.join(Tenderloin.config.chef.provisioning_path, "dna.json"))
+          Tenderloin.config.provisioning.command = "/tmp/tenderloin_provision.sh"
         end
 
-        def setup_solo_config
-          solo_file = <<-solo
-file_cache_path "#{Tenderloin.config.chef.provisioning_path}"
-cookbook_path "#{cookbooks_path}"
-solo
-
-          logger.info "Uploading chef-solo configuration script..."
-          SSH.upload!(StringIO.new(solo_file), File.join(Tenderloin.config.chef.provisioning_path, "solo.rb"))
-        end
-
-        def run_chef_solo
-          logger.info "Running chef recipes..."
-          SSH.execute do |ssh|
-            ssh.exec!("cd #{Tenderloin.config.chef.provisioning_path} && sudo chef-solo -c solo.rb -j dna.json") do |channel, data, stream|
+        def run_command
+          logger.info "Running Provisioning command..."
+          cmd = ""
+          cmd << "chmod +x /tmp/tenderloin_provision.sh && " if Tenderloin.config.provisioning.script
+          cmd << Tenderloin.config.provisioning.command
+          SSH.execute(@runner.fusion_vm.ip) do |ssh|
+            ssh.exec!(cmd) do |channel, data, stream|
               # TODO: Very verbose. It would be easier to save the data and only show it during
               # an error, or when verbosity level is set high
               logger.info("#{stream}: #{data}")
@@ -58,13 +29,6 @@ solo
           end
         end
 
-        def cookbooks_path
-          File.join(Tenderloin.config.chef.provisioning_path, "cookbooks")
-        end
-
-        def collect_shared_folders
-          ["tenderloin-provisioning", File.expand_path(Tenderloin.config.chef.cookbooks_path, Env.root_path), cookbooks_path]
-        end
       end
     end
   end

data/lib/tenderloin/actions/vm/reload.rb

@@ -4,8 +4,8 @@ module Tenderloin
       class Reload < Base
         def prepare
           steps = [SharedFolders, Boot]
-          steps.unshift(Halt) if @runner.vm.running?
-          steps << Provision if Tenderloin.config.chef.enabled
+          steps.unshift(Halt) if @runner.fusion_vm.running?
+          steps << Provision if Tenderloin.config.provisioning.enabled
 
           steps.each do |action_klass|
             @runner.add_action(action_klass)

data/lib/tenderloin/actions/vm/shared_folders.rb

@@ -5,6 +5,8 @@ module Tenderloin
         def shared_folders
           shared_folders = @runner.invoke_callback(:collect_shared_folders)
 
+          shared_folders = shared_folders + Tenderloin.config.shared_folders.folders
+
           # Basic filtering of shared folders. Basically only verifies that
           # the result is an array of 3 elements. In the future this should
           # also verify that the host path exists, the name is valid,
@@ -15,7 +17,7 @@ module Tenderloin
             else
               nil
             end
-          end.compact
+          end#.compact
         end
 
         def before_boot
@@ -23,20 +25,22 @@ module Tenderloin
         end
 
         def after_boot
-          logger.info "Creating shared folders metadata..."
+          if Tenderloin.config.shared_folders.enabled
+            logger.info "Creating shared folders metadata..."
 
-          shared_folders.each do |name, hostpath, guestpath|
-            @runner.fusion_vm.share_folder(name, hostpath)
-            @runner.fusion_vm.enable_shared_folders
-          end
+            shared_folders.each do |name, hostpath, guestpath|
+              @runner.fusion_vm.share_folder(name, File.expand_path(hostpath))
+              @runner.fusion_vm.enable_shared_folders
+            end
 
-          logger.info "Linking shared folders..."
+            logger.info "Linking shared folders..."
 
-          Tenderloin::SSH.execute(@runner.fusion_vm.ip) do |ssh|
-            shared_folders.each do |name, hostpath, guestpath|
-              logger.info "-- #{name}: #{guestpath}"
-              ssh.exec!("sudo ln -s /mnt/hgfs/#{name} #{guestpath}")
-              ssh.exec!("sudo chown #{Tenderloin.config.ssh.username} #{guestpath}")
+            Tenderloin::SSH.execute(@runner.fusion_vm.ip) do |ssh|
+              shared_folders.each do |name, hostpath, guestpath|
+                logger.info "-- #{name}: #{guestpath}"
+                ssh.exec!("sudo ln -s /mnt/hgfs/#{name} #{guestpath}")
+                ssh.exec!("sudo chown #{Tenderloin.config.ssh.username} #{guestpath}")
+              end
             end
           end
         end

data/lib/tenderloin/actions/vm/up.rb

@@ -17,7 +17,7 @@ msg
           # Up is a "meta-action" so it really just queues up a bunch
           # of other actions in its place:
           steps = [Import, SharedFolders, Boot]
-          steps << Provision if Tenderloin.config.chef.enabled
+          steps << Provision if Tenderloin.config.provisioning.enabled
           steps.insert(0, MoveHardDrive) if Tenderloin.config.vm.hd_location
 
           steps.each do |action_klass|

data/lib/tenderloin/cli.rb

@@ -49,6 +49,12 @@ module Tenderloin
       Tenderloin::Commands.reload
     end
 
+    desc "provision [--file <tenderfile>]", "Runs the provisioning script"
+    def provision()
+      setup
+      Tenderloin::Commands.provision
+    end
+
     desc "ssh [--file <tenderfile>]", "SSH's in to the VM"
     def ssh()
       setup

data/lib/tenderloin/commands.rb

@@ -143,6 +143,13 @@ error
         box.destroy
       end
 
+      # Runs the provisioning script
+      def provision
+        Env.load!
+        Env.require_persisted_vm
+        Env.persisted_vm.execute!(Actions::VM::Provision)
+      end
+
       private
 
       def act_on_vm(&block)

data/lib/tenderloin/config.rb

@@ -86,25 +86,6 @@ module Tenderloin
       attr_accessor :extension
     end
 
-    class ChefConfig < Base
-      attr_accessor :cookbooks_path
-      attr_accessor :provisioning_path
-      attr_accessor :json
-      attr_accessor :enabled
-
-      def initialize
-        @enabled = false
-      end
-
-      def to_json
-        # Overridden so that the 'json' key could be removed, since its just
-        # merged into the config anyways
-        data = instance_variables_hash
-        data.delete(:json)
-        data.to_json
-      end
-    end
-
     class TenderloinConfig < Base
       attr_accessor :dotfile_name
       attr_accessor :log_output
@@ -115,19 +96,34 @@ module Tenderloin
       end
     end
 
+    class ProvisioningConfig
+      attr_accessor :script
+      attr_accessor :command
+      def enabled
+        script || command
+      end
+    end
+
+    class SharedFoldersConfig
+      attr_accessor :enabled
+      attr_accessor :folders
+    end
+
     class Top < Base
       attr_reader :package
       attr_reader :ssh
       attr_reader :vm
-      attr_reader :chef
       attr_reader :tenderloin
+      attr_reader :provisioning
+      attr_reader :shared_folders
 
       def initialize
         @ssh = SSHConfig.new
         @vm = VMConfig.new
-        @chef = ChefConfig.new
         @tenderloin = TenderloinConfig.new
         @package = PackageConfig.new
+        @provisioning = ProvisioningConfig.new
+        @shared_folders = SharedFoldersConfig.new
 
         @loaded = false
       end

data/lib/tenderloin/fusion_vm.rb

@@ -63,6 +63,11 @@ module Tenderloin
     end
 
     def share_folder(name, hostpath)
+      # Try and clean up first, to handle path changes.
+      begin
+        run 'removeSharedFolder', "#{name}"
+      rescue
+      end
       run 'addSharedFolder', "#{name} #{hostpath}"
     end
 

data/lib/tenderloin/ssh.rb

@@ -18,8 +18,8 @@ module Tenderloin
         end
       end
 
-      def upload!(from, to)
-        execute do |ssh|
+      def upload!(ip, from, to)
+        execute(ip) do |ssh|
           scp = Net::SCP.new(ssh)
           scp.upload!(from, to)
         end

data/templates/Tenderfile

@@ -5,4 +5,19 @@ Tenderloin::Config.run do |config|
 
   # Every Tenderloin virtual environment requires a box to build off of.
   config.vm.box = "base"
+
+  ## SSH username and password defaults to 'tenderloin'. You can change this.
+  # config.ssh.username = 'youruser'
+  # config.ssh.password = 'yourpass'
+
+  ## Provisioning can either provide a shell script, or a command to execute
+  # config.provisioning.script = <<EOF
+# ls /usr
+# EOF
+  # config.provisioning.command = "apt-get install -y ruby"
+
+  ## Shared folders are enabled by default, and the project dir is always shared
+  ## You can turn this off, or add additional folders
+  # config.shared_folders.enabled = false
+  # config.shared_folders.folders = [[["my-files", "src", "/mnt/src"], ["bin-files", "bin", "/mnt/bin"]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tenderloin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors: