infrataster 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80561f12bb0ff0f01741cdb57baaea2d56513800
-  data.tar.gz: aea47ce92d3d24b3f8ac017f2aad48a8e71213da
+  metadata.gz: f005787139f6d46caa2c8bbc1f1972d020521e88
+  data.tar.gz: 01d64f70e9addd588db3e28ea05b4ed89c5b1e93
 SHA512:
-  metadata.gz: f5ca242ca143cb319d2bbc36f99d4261ecf3ea06092ef91006e89847bc6d618ff4f4ed736fe2915b23f87415f9458c75740edb3deb972da58a7395040a091fd7
-  data.tar.gz: 9bdfabefd96a457c42b735b5510c77b3c87c9e8a53b4f1c8e86effb677f3f2e0cfb8355e77e8b67ef94dcf0a3ce3bf88e8065e46e70edf5c37abe016a11c0b0a
+  metadata.gz: ae1e92edb5053e0a85787d50d1d6c7839cc81026bc7f6d14392d9e91e1c80e9d2eda65526b9d3851bc2cbb18d7b81ed3e982864c294aa172b4974e757253e14c
+  data.tar.gz: 6857b48c2b0e3403b46eaea0631f8844fdb456567f550f057728291113b81bc0ffc5219a48680e64cff7ce81f4d278f6b1e8aaae39e7636b85b72d4e74e9d219

data/README.md

@@ -90,7 +90,7 @@ describe server(:app) do
       expect(response.body).to include('Hello Sinatra')
     end
     it "responds as 'text/html'" do
-      expect(response.headers['content-type']).to match(%r{^text/html})
+      expect(response.headers['content-type']).to eq("text/html")
     end
   end
 end

data/bin/infrataster

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require 'infrataster/cli'
+
+Infrataster::CLI.start(ARGV)
+

data/infrataster.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "capybara"
   spec.add_runtime_dependency "poltergeist"
   spec.add_runtime_dependency "faraday"
+  spec.add_runtime_dependency "thor"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

data/lib/infrataster/cli.rb

@@ -0,0 +1,48 @@
+require 'thor'
+require 'fileutils'
+require 'erb'
+
+module Infrataster
+  class CLI < Thor
+    desc "init", "Initialize Infrataster specs."
+    option :path, type: :string, default: '.'
+    def init
+      path = File.expand_path(options[:path])
+      FileUtils.mkdir_p(path)
+      create_file_from_template(File.expand_path("Gemfile", path))
+      create_file_from_template(File.expand_path("Rakefile", path))
+      FileUtils.mkdir(File.expand_path("spec", path))
+      if ask_yes_or_no("Use Vagrant?")
+        create_file_from_template(File.expand_path("spec/Vagrantfile", path))
+      end
+      create_file_from_template(File.expand_path("spec/spec_helper.rb", path))
+      create_file_from_template(File.expand_path("spec/app_spec.rb", path))
+    end
+
+    private
+    def ask_yes_or_no(question)
+      print "#{question} (y/N): "
+      answer = $stdin.gets
+      if answer =~ /^y/i
+        true
+      else
+        false
+      end
+    end
+
+    def create_file_from_template(path)
+      basename = File.basename(path)
+
+      if File.exist?(path)
+        puts "#{basename} exists already. Skip."
+        return
+      end
+
+      open(path, 'w') do |f|
+        f.write(ERB.new(File.read(File.expand_path("../fixtures/#{basename}.erb", __FILE__))).result)
+      end
+
+      puts "Created: #{basename}"
+    end
+  end
+end

data/lib/infrataster/contexts/http_context.rb

@@ -17,7 +17,7 @@ module Infrataster
             resource.params.each_pair do |k, v|
               req.params[k] = v
             end
-            req.headers['Host'] = resource.uri.host
+            req.headers['Host'] = determine_host(address)
             resource.headers.each_pair do |k, v|
               req.headers[k] = v
             end
@@ -25,6 +25,10 @@ module Infrataster
           end
         end
       end
+
+      def determine_host(default)
+        resource.uri.host || (server.options[:http] && server.options[:http][:host]) || default
+      end
     end
   end
 end

data/lib/infrataster/fixtures/Gemfile.erb

@@ -0,0 +1,7 @@
+# Generated by `infrataster init`
+source "https://rubygems.org"
+
+gem "infrataster"
+
+# If you would like to test mysql, uncomment the next line.
+# gem "infrataster-plugin-mysql"

data/lib/infrataster/fixtures/Rakefile.erb

@@ -0,0 +1,42 @@
+# Generated by `infrataster init`
+
+require "rspec/core/rake_task"
+
+def exec_and_abort_if_fail(cmd)
+  system cmd
+  unless $?.exitstatus == 0
+    $stderr.puts "'#{cmd}' failed."
+    abort
+  end
+end
+
+desc 'Run tests'
+task :spec => ['spec:integration']
+
+namespace :spec do
+  RSpec::Core::RakeTask.new("infrataster") do |task|
+    task.pattern = "./spec/{,/*/**}/*_spec.rb"
+  end
+
+  desc 'Prepare'
+  task :prepare do
+    exec_and_abort_if_fail '/usr/bin/vagrant up'
+    exec_and_abort_if_fail '/usr/bin/vagrant provision'
+  end
+
+  desc 'Provision'
+  task :provision do
+    exec_and_abort_if_fail '/usr/bin/vagrant provision'
+  end
+
+  desc 'Restart VMs'
+  task :restart do
+    exec_and_abort_if_fail '/usr/bin/vagrant reload --provision'
+  end
+
+  desc 'Clean'
+  task :clean do
+    exec_and_abort_if_fail '/usr/bin/vagrant destroy -f'
+  end
+end
+

data/lib/infrataster/fixtures/Vagrantfile.erb

@@ -0,0 +1,13 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# Generated by `infrataster init`
+
+VAGRANTFILE_API_VERSION = "2"
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = "hashicorp/precise64"
+
+  config.vm.define :app do |c|
+    c.vm.network "private_network", ip: "192.168.44.10"
+  end
+end

data/lib/infrataster/fixtures/app_spec.rb.erb

@@ -0,0 +1,11 @@
+# Generated by `infrataster init`
+require 'spec_helper'
+
+describe server(:app) do
+  describe http('http://app') do
+    it "responds OK 200" do
+      expect(response.status).to eq(200)
+    end
+  end
+end
+

data/lib/infrataster/fixtures/spec_helper.rb.erb

@@ -0,0 +1,18 @@
+# Generated by `infrataster init`
+require 'infrataster/rspec'
+
+ENV['VAGRANT_CWD'] = File.dirname(__FILE__)
+
+Infrataster::Server.define(
+  :app,
+  '192.168.0.0/16',
+  vagrant: true,
+)
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  config.order = 'random'
+end

data/lib/infrataster/resources/http_resource.rb

@@ -11,8 +11,12 @@ module Infrataster
       def initialize(url_str, options = {})
         @options = {params: {}, method: :get, headers: {}}.merge(options)
         @uri = URI.parse(url_str)
-        unless %w!http https!.include?(@uri.scheme)
-          raise Error, "The provided url, '#{@uri}', is not http or https."
+        if @uri.scheme
+          unless %w!http https!.include?(@uri.scheme)
+            raise Error, "The provided url, '#{@uri}', is not http or https."
+          end
+        else
+          @uri = URI::HTTP.build([@uri.userinfo, @uri.host, @uri.port, @uri.path, @uri.query, @uri.fragment])
         end
       end
 

data/lib/infrataster/server.rb

@@ -77,9 +77,15 @@ module Infrataster
       end
     end
 
+    def ssh(&block)
+      Net::SSH.start(*ssh_start_args) do |ssh|
+        block.call(ssh)
+      end
+    end
+
     def ssh_exec(cmd, &block)
       result = nil
-      Net::SSH.start(*ssh_start_args) do |ssh|
+      ssh do |ssh|
         result = ssh.exec!(cmd, &block)
       end
       result

data/lib/infrataster/version.rb

@@ -1,3 +1,3 @@
 module Infrataster
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end

data/spec/integration/http_spec.rb

@@ -51,6 +51,12 @@ describe server(:app) do
       expect(body_as_json['headers']['USER']).to eq('VALUE')
     end
   end
+
+  describe http('/path/to/resource') do
+    it "sends GET request with scheme and host" do
+      expect(body_as_json['headers']['HOST']).to eq('example.com')
+    end
+  end
 end
 
 

data/spec/integration/other_spec.rb

@@ -15,5 +15,11 @@ describe server(:proxy) do
     result = current_server.ssh_exec("cat /tmp/test-#{time.to_i}")
     expect(result.chomp).to eq('Hello')
   end
+  it "connects to the current server via SSH" do
+    current_server.ssh do |ssh|
+      expect(ssh.exec!('echo -n Hello')).to eq('Hello')
+    end
+  end
+
 end
 

data/spec/integration/spec_helper.rb

@@ -10,6 +10,7 @@ Infrataster::Server.define(
   '172.16.0.0/16',
   vagrant: true,
   from: :proxy,
+  http: {host: 'example.com'},
 )
 
 RSpec.configure do |config|

data/spec/unit/lib/infrataster/contexts/http_context_spec.rb

@@ -0,0 +1,30 @@
+require 'unit/spec_helper'
+
+module Infrataster
+  module Contexts
+    describe HttpContext do
+      context "with relative URI resource" do
+        let(:address)  { '127.0.0.1' }
+        let(:port)     { 80 }
+        let(:resource) { Resources::HttpResource.new('/path/to/resource') }
+        subject        { described_class.new(server, resource) }
+
+        context "with http host definition" do
+          let(:server) { Server.new('example.com', address, http: {:host => 'example.com'}) }
+
+          it "complements host with server definition" do
+            expect(subject.determine_host(address)).to eq('example.com')
+          end
+        end
+
+        context "with no http host definition" do
+          let(:server) { Server.new('example.com', address) }
+
+          it "complements host with ip address" do
+            expect(subject.determine_host(address)).to eq('127.0.0.1')
+          end
+        end
+      end
+    end
+  end
+end

data/spec/unit/lib/infrataster/resources/http_resource_spec.rb

@@ -0,0 +1,14 @@
+require 'unit/spec_helper'
+
+module Infrataster
+  module Resources
+    describe HttpResource do
+      context "with no scheme URI" do
+        it "complements scheme" do
+          resource = HttpResource.new('/path/to/resource')
+          expect(resource.uri.scheme).to eq('http')
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infrataster
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +153,8 @@ dependencies:
 description: 
 email:
 - ryota.arai@gmail.com
-executables: []
+executables:
+- infrataster
 extensions: []
 extra_rdoc_files: []
 files:
@@ -150,13 +165,20 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/infrataster
 - infrataster.gemspec
 - lib/infrataster.rb
+- lib/infrataster/cli.rb
 - lib/infrataster/contexts.rb
 - lib/infrataster/contexts/base_context.rb
 - lib/infrataster/contexts/capybara_context.rb
 - lib/infrataster/contexts/http_context.rb
 - lib/infrataster/contexts/no_resource_context.rb
+- lib/infrataster/fixtures/Gemfile.erb
+- lib/infrataster/fixtures/Rakefile.erb
+- lib/infrataster/fixtures/Vagrantfile.erb
+- lib/infrataster/fixtures/app_spec.rb.erb
+- lib/infrataster/fixtures/spec_helper.rb.erb
 - lib/infrataster/helpers.rb
 - lib/infrataster/helpers/resource_helper.rb
 - lib/infrataster/helpers/rspec_helper.rb
@@ -185,6 +207,8 @@ files:
 - spec/integration/vm/cookbooks/proxy/recipes/default.rb
 - spec/integration/vm/cookbooks/proxy/templates/default/integration-test.erb
 - spec/integration/vm/vendor/.gitignore
+- spec/unit/lib/infrataster/contexts/http_context_spec.rb
+- spec/unit/lib/infrataster/resources/http_resource_spec.rb
 - spec/unit/lib/infrataster/server_spec.rb
 - spec/unit/spec_helper.rb
 homepage: https://github.com/ryotarai/infrataster
@@ -229,5 +253,7 @@ test_files:
 - spec/integration/vm/cookbooks/proxy/recipes/default.rb
 - spec/integration/vm/cookbooks/proxy/templates/default/integration-test.erb
 - spec/integration/vm/vendor/.gitignore
+- spec/unit/lib/infrataster/contexts/http_context_spec.rb
+- spec/unit/lib/infrataster/resources/http_resource_spec.rb
 - spec/unit/lib/infrataster/server_spec.rb
 - spec/unit/spec_helper.rb