fry-cook 0.2.0 → 0.3.0

data/README.md

@@ -133,3 +133,25 @@ you can add it to your Vagrantfile as follows:
 This really needs more testing infrastructure (or any at all). It also needs
 a command to rebuild the repo without restarting the server, which is not
 terribly difficult.
+
+### Contributing
+
+To audition changes made within your fork:
+
+ 1. Update lib/fry-cook/version.rb
+ 2. `gem build fry-cook.gemspec` then `vagrant plugin install fry-cook-NN.NN.gem`
+ 3. `vagrant provision`
+
+### Debugging and Troubleshooting
+
+If you're having issues provisioning using Vagrant you may be inclined to help troubleshoot.
+
+First, consider using `VAGRANT_LOG=debug` to get more detailed output from Vagrant itself.
+
+If you've identified a particular chef-zero (the underlying http-based app)
+request, you can save yourself having to reprovision every time you do a debug
+cycle. Run fry-cook (via the Vagrant plugin) directly with:
+
+  bundle exec fry-cook --host <host-ip-address> --path <path-to-chef-repository> --storage-path <path-to-chef-repository>/.vagrant/fry-cook/default
+
+You can then hit <host-ip-address> with `curl` to issue http requests.

data/lib/fry_cook/vagrant_plugin/config.rb

@@ -9,12 +9,21 @@ module FryCook
       def self.config_attrs
         @config_attrs || {}
       end
+      def self.host_ip_address
+        # This gets the first ip address in a private range. With virtualbox,
+        # at least, things seem to be routed so that the vm can connect to this
+        # IP even if it has nothing to do with vagrant or virtualbox. This may not
+        # be an entirely safe assumption, but vagrant doesn't provide any kind of
+        # better way to obtain a canonical reachable address as far as I can tell.
+        Socket.ip_address_list.detect{|intf| intf.ipv4_private?}.ip_address
+      end
 
       config_attr :repo_path
       config_attr :repo_git_remote
       config_attr :repo_git_track, "master"
       config_attr :prefix, "default"
       config_attr :server_port, 18998
+      config_attr :server_host, host_ip_address
 
       def initialize()
         self.class.config_attrs.each do |config_attr, default|
@@ -33,6 +42,7 @@ module FryCook
         end
         {}
       end
+
     end
   end
 end

data/lib/fry_cook/vagrant_plugin/hooks.rb

@@ -22,15 +22,6 @@ module FryCook::VagrantPlugin::Hooks
       client_config.any? && config.repo_path || config.repo_git_remote
     end
 
-    def host_ip_address
-      # This gets the first ip address in a private range. With virtualbox,
-      # at least, things seem to be routed so that the vm can connect to this
-      # IP even if it has nothing to do with vagrant or virtualbox. This may not
-      # be an entirely safe assumption, but vagrant doesn't provide any kind of
-      # better way to obtain a canonical reachable address as far as I can tell.
-      Socket.ip_address_list.detect{|intf| intf.ipv4_private?}.ip_address
-    end
-
     def call(env)
       @env = env
       if active?
@@ -59,7 +50,7 @@ module FryCook::VagrantPlugin::Hooks
         fake_key = get_fake_key_path
 
         if !client.config.instance_variable_get(:"@chef_server_url")
-          client.config.instance_variable_set(:"@chef_server_url", "http://#{host_ip_address}:#{config.server_port}/")
+          client.config.instance_variable_set(:"@chef_server_url", "http://#{config.server_host}:#{config.server_port}/")
         end
         if !client.config.instance_variable_get(:@validation_key_path)
           client.config.instance_variable_set(:@validation_key_path, fake_key)
@@ -75,9 +66,8 @@ module FryCook::VagrantPlugin::Hooks
       # parallel at the moment at any rate.
       if !defined? @@running
         server_options = {
-          host: host_ip_address,
+          host: config.server_host,
           port: config.server_port,
-          daemon: false,
         }
         fry_options = {
           storage_path: ".vagrant/fry-cook/#{config.prefix}",

data/lib/fry_cook/version.rb

@@ -1,3 +1,3 @@
 module FryCook
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,168 +1,151 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fry-cook
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Graham Batty
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-03-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-05-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: chef
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 11
-        version: "11"
+      - !ruby/object:Gem::Version
+        version: '11'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: chef-zero
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '11'
+- !ruby/object:Gem::Dependency
+  name: chef-zero
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 7
-        version: "1.7"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: berkshelf
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: berkshelf
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: -2129392858
-        segments: 
-        - 3
-        - 0
-        - 0
-        - beta
-        - 7
-        version: 3.0.0.beta7
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec-core
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 2
-        - 13
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec-expectations
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 2
-        - 13
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec-mocks
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 2
-        - 13
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.13.0
 description: Not quite a chef yet, the fry cook knows only one menu.
 email: graham@stormbrew.ca
-executables: 
+executables:
 - fry-cook
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/fry-cook
-- lib/fry_cook/version.rb
-- lib/fry_cook/vagrant_plugin/hooks.rb
+- lib/fry-cook.rb
 - lib/fry_cook/vagrant_plugin/config.rb
+- lib/fry_cook/vagrant_plugin/hooks.rb
 - lib/fry_cook/work_tree.rb
 - lib/fry_cook/server.rb
+- lib/fry_cook/version.rb
 - lib/fry_cook/vagrant_plugin.rb
-- lib/fry-cook.rb
 - LICENSE
 - README.md
 homepage: https://www.github.com/stormbrew/fry-cook
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Not quite a chef yet, the fry cook knows only one menu.
 test_files: []
-