infrataster 0.1.0 → 0.1.1

data/spec/integration/vm/app/app.rb

@@ -0,0 +1,39 @@
+require 'sinatra'
+require 'json'
+
+get '/' do
+  result = {
+    'app' => 'sinatra',
+    'method' => 'GET',
+    'params' => params,
+    'headers' => RequestWrapper.new(request).headers,
+  }
+
+  result.to_json
+end
+
+post '/' do
+  result = {
+    'app' => 'sinatra',
+    'method' => 'POST',
+    'params' => params,
+    'headers' => RequestWrapper.new(request).headers,
+  }
+
+  result.to_json
+end
+
+class RequestWrapper
+  def initialize(request)
+    @request = request
+  end
+
+  def headers
+    headers = @request.env.select do |k, v|
+      k.start_with?('HTTP_')
+    end.map do |k, v|
+      [k[5..-1], v]
+    end
+    Hash[headers]
+  end
+end

data/spec/integration/vm/cookbooks/app/files/default/rackup.conf

@@ -0,0 +1,3 @@
+[program:rackup]
+directory=/vagrant/app
+command=rackup -p 80 config.ru

data/spec/integration/vm/cookbooks/app/recipes/default.rb

@@ -0,0 +1,35 @@
+# install ruby and so on
+package 'python-software-properties'
+
+execute 'apt-add-repository ppa:brightbox/ruby-ng && apt-get update' do
+  not_if 'test -e /etc/apt/sources.list.d/brightbox-ruby-ng-precise.list'
+end
+
+package 'build-essential'
+
+package 'ruby2.1'
+
+package 'ruby2.1-dev'
+
+execute 'gem install bundler' do
+  not_if "gem list | grep -q 'bundler '"
+end
+
+execute 'bundle install' do
+  cwd '/vagrant/app'
+end
+
+# supervisor
+package 'supervisor'
+
+execute 'reload supervisor' do
+  command 'supervisorctl reload'
+  action :nothing
+end
+
+cookbook_file '/etc/supervisor/conf.d/rackup.conf' do
+  notifies :run, 'execute[reload supervisor]'
+end
+
+execute 'supervisorctl restart rackup'
+

data/spec/integration/vm/cookbooks/apt-mirror/recipes/default.rb

@@ -0,0 +1,4 @@
+execute "sed -i -e 's| \\(http[^ ]\\+\\)| mirror://mirrors.ubuntu.com/mirrors.txt|g' /etc/apt/sources.list"
+
+include_recipe 'apt'
+

data/spec/integration/vm/cookbooks/proxy/files/default/index.html

@@ -0,0 +1 @@
+This is static site.

data/spec/integration/vm/cookbooks/proxy/recipes/default.rb

@@ -0,0 +1,22 @@
+package 'nginx'
+
+service 'nginx' do
+  action :start
+  supports :restart => true
+end
+
+file '/etc/nginx/sites-enabled/default' do
+  action :delete
+end
+
+template '/etc/nginx/sites-available/integration-test'
+
+link '/etc/nginx/sites-enabled/integration-test' do
+  to '/etc/nginx/sites-available/integration-test'
+  notifies :restart, 'service[nginx]'
+end
+
+cookbook_file '/usr/share/nginx/www/index.html' do
+  mode '0644'
+end
+

data/spec/integration/vm/cookbooks/proxy/templates/default/integration-test.erb

@@ -0,0 +1,65 @@
+server {
+	listen 80;
+
+	root /usr/share/nginx/www;
+	index index.html index.htm;
+
+	server_name static.example.com;
+
+	location / {
+		try_files $uri $uri/ /index.html;
+	}
+}
+
+server {
+	listen 80;
+
+	root /usr/share/nginx/www;
+	index index.html index.htm;
+
+	server_name app.example.com;
+
+	location / {
+    proxy_pass http://<%= node['addresses']['app'] %>;
+	}
+}
+
+
+# another virtual host using mix of IP-, name-, and port-based configuration
+#
+#server {
+#	listen 8000;
+#	listen somename:8080;
+#	server_name somename alias another.alias;
+#	root html;
+#	index index.html index.htm;
+#
+#	location / {
+#		try_files $uri $uri/ /index.html;
+#	}
+#}
+
+
+# HTTPS server
+#
+#server {
+#	listen 443;
+#	server_name localhost;
+#
+#	root html;
+#	index index.html index.htm;
+#
+#	ssl on;
+#	ssl_certificate cert.pem;
+#	ssl_certificate_key cert.key;
+#
+#	ssl_session_timeout 5m;
+#
+#	ssl_protocols SSLv3 TLSv1;
+#	ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
+#	ssl_prefer_server_ciphers on;
+#
+#	location / {
+#		try_files $uri $uri/ /index.html;
+#	}
+#}

data/spec/unit/lib/infrataster/server_spec.rb

@@ -0,0 +1,49 @@
+require 'unit/spec_helper'
+
+module Infrataster
+  describe Server do
+    describe "self.define" do
+      it "adds a Server instance to defined_servers" do
+        described_class.define('name', 'address', {})
+        servers = described_class.defined_servers
+        expect(servers.size).to eq(1)
+        expect(servers[0].name).to eq('name')
+        expect(servers[0].address).to eq('address')
+        expect(servers[0].options).to eq({})
+      end
+    end
+
+    describe "self.find_by_name" do
+      it "finds a server by name" do
+        described_class.define('name', 'address', {})
+        server = described_class.find_by_name('name')
+        expect(server.name).to eq('name')
+        expect(server.address).to eq('address')
+        expect(server.options).to eq({})
+      end
+    end
+
+    describe "#from" do
+      it "returns 'from' server instance" do
+        described_class.define('proxy', 'address', {})
+        described_class.define('app', 'address', from: 'proxy')
+        app_server = described_class.find_by_name('app')
+        expect(app_server.from.name).to eq('proxy')
+      end
+    end
+
+    describe "#ssh_gateway" do
+      it "returns gateway instance and proc for finalizing" do
+        server = Server.new('name', 'address', ssh: {host: 'host', user: 'user'})
+
+        gateway_mock = double
+        expect(gateway_mock).to receive(:shutdown!)
+        expect(Net::SSH::Gateway).to receive(:new).and_return(gateway_mock)
+        gateway, finalize_proc = server.ssh_gateway
+        finalize_proc.call
+        expect(gateway).to eq(gateway_mock)
+      end
+    end
+  end
+end
+

data/spec/unit/spec_helper.rb

@@ -0,0 +1,23 @@
+require 'infrataster'
+
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+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
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+
+  config.before(:each) do
+    Infrataster::Server.clear_defined_servers
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infrataster
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  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
@@ -136,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: berkshelf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.1
 description: 
 email:
 - ryota.arai@gmail.com
@@ -144,29 +172,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- example/.gitignore
-- example/.rspec
-- example/Berksfile
-- example/Gemfile
-- example/README.md
-- example/Vagrantfile
-- example/cookbooks/app/recipes/default.rb
-- example/cookbooks/db/files/default/my.cnf
-- example/cookbooks/db/recipes/default.rb
-- example/cookbooks/proxy/metadata.rb
-- example/cookbooks/proxy/recipes/default.rb
-- example/cookbooks/proxy/templates/default/app.erb
-- example/cookbooks/proxy/templates/default/static.erb
-- example/sinatra_app/.gitignore
-- example/sinatra_app/Gemfile
-- example/sinatra_app/app.rb
-- example/sinatra_app/config.ru
-- example/spec/spec_helper.rb
-- example/spec/web_spec.rb
 - infrataster.gemspec
 - lib/infrataster.rb
 - lib/infrataster/browsermob_proxy.rb
@@ -176,17 +187,33 @@ files:
 - lib/infrataster/contexts/http_context.rb
 - lib/infrataster/contexts/mysql_query_context.rb
 - lib/infrataster/helpers.rb
+- lib/infrataster/helpers/resource_helper.rb
 - lib/infrataster/helpers/rspec_helper.rb
-- lib/infrataster/helpers/type_helper.rb
+- lib/infrataster/resources.rb
+- lib/infrataster/resources/base_resource.rb
+- lib/infrataster/resources/capybara_resource.rb
+- lib/infrataster/resources/http_resource.rb
+- lib/infrataster/resources/mysql_query_resource.rb
+- lib/infrataster/resources/server_resource.rb
 - lib/infrataster/rspec.rb
 - lib/infrataster/server.rb
-- lib/infrataster/types.rb
-- lib/infrataster/types/base_type.rb
-- lib/infrataster/types/capybara_type.rb
-- lib/infrataster/types/http_type.rb
-- lib/infrataster/types/mysql_query_type.rb
-- lib/infrataster/types/server_type.rb
 - lib/infrataster/version.rb
+- spec/integration/http_spec.rb
+- spec/integration/spec_helper.rb
+- spec/integration/vm/.gitignore
+- spec/integration/vm/Berksfile
+- spec/integration/vm/Vagrantfile
+- spec/integration/vm/app/Gemfile
+- spec/integration/vm/app/app.rb
+- spec/integration/vm/app/config.ru
+- spec/integration/vm/cookbooks/app/files/default/rackup.conf
+- spec/integration/vm/cookbooks/app/recipes/default.rb
+- spec/integration/vm/cookbooks/apt-mirror/recipes/default.rb
+- spec/integration/vm/cookbooks/proxy/files/default/index.html
+- spec/integration/vm/cookbooks/proxy/recipes/default.rb
+- spec/integration/vm/cookbooks/proxy/templates/default/integration-test.erb
+- spec/unit/lib/infrataster/server_spec.rb
+- spec/unit/spec_helper.rb
 homepage: https://github.com/ryotarai/infrataster
 licenses:
 - MIT
@@ -211,4 +238,20 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Infrastructure Behavior Testing Framework
-test_files: []
+test_files:
+- spec/integration/http_spec.rb
+- spec/integration/spec_helper.rb
+- spec/integration/vm/.gitignore
+- spec/integration/vm/Berksfile
+- spec/integration/vm/Vagrantfile
+- spec/integration/vm/app/Gemfile
+- spec/integration/vm/app/app.rb
+- spec/integration/vm/app/config.ru
+- spec/integration/vm/cookbooks/app/files/default/rackup.conf
+- spec/integration/vm/cookbooks/app/recipes/default.rb
+- spec/integration/vm/cookbooks/apt-mirror/recipes/default.rb
+- spec/integration/vm/cookbooks/proxy/files/default/index.html
+- spec/integration/vm/cookbooks/proxy/recipes/default.rb
+- spec/integration/vm/cookbooks/proxy/templates/default/integration-test.erb
+- spec/unit/lib/infrataster/server_spec.rb
+- spec/unit/spec_helper.rb

data/example/.gitignore

@@ -1,4 +0,0 @@
-/Gemfile.lock
-/Berksfile.lock
-/.vagrant
-/vendor

data/example/Berksfile

@@ -1,2 +0,0 @@
-site :opscode
-cookbook 'apt'

data/example/Gemfile

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'infrataster', path: '..'
-gem 'berkshelf', github: 'berkshelf/berkshelf'
-
-gem 'pry'
-gem 'pry-byebug'
-gem 'pry-rescue'

data/example/README.md

@@ -1,13 +0,0 @@
-# Infrataster Example
-
-```
-$ cd example
-$ wget https://s3-us-west-1.amazonaws.com/lightbody-bmp/browsermob-proxy-2.0-beta-9-bin.zip
-$ unzip browsermob-proxy-2.0-beta-9-bin.zip
-$ mv browsermob-proxy-2.0-beta-9 vendor/browsermob
-$ bundle install
-$ bundle exec berks vendor vendor/cookbooks
-$ vagrant up
-$ bundle exec rspec
-```
-

data/example/Vagrantfile

@@ -1,81 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-COOKBOOK_PATH = ['./cookbooks', './vendor/cookbooks']
-APP_IP = "172.16.33.11"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "hashicorp/precise64"
-
-  config.vm.define :proxy do |c|
-    c.vm.network "private_network", ip: "192.168.33.10"
-    c.vm.network "private_network", ip: "172.16.33.10", virtualbox__intnet: "infrataster-example"
-
-    c.vm.provision "chef_solo" do |chef|
-      chef.cookbooks_path = COOKBOOK_PATH
-      chef.add_recipe "proxy"
-      chef.json = {'app_ip' => APP_IP}
-    end
-  end
-
-  config.vm.define :app do |c|
-    c.vm.network "private_network", ip: APP_IP, virtualbox__intnet: "infrataster-example"
-
-    c.vm.provision "chef_solo" do |chef|
-      chef.cookbooks_path = COOKBOOK_PATH
-      chef.add_recipe "app"
-      chef.json = {}
-    end
-  end
-
-  config.vm.define :db do |c|
-    c.vm.network "private_network", ip: '172.16.33.12', virtualbox__intnet: "infrataster-example"
-
-    c.vm.provision "chef_solo" do |chef|
-      chef.cookbooks_path = COOKBOOK_PATH
-      chef.add_recipe "db"
-      chef.json = {'app_ip' => APP_IP}
-    end
-  end
-
-  # Enable provisioning with chef solo, specifying a cookbooks path, roles
-  # path, and data_bags path (all relative to this Vagrantfile), and adding
-  # some recipes and/or roles.
-  #
-  # config.vm.provision "chef_solo" do |chef|
-  #   chef.cookbooks_path = "../my-recipes/cookbooks"
-  #   chef.roles_path = "../my-recipes/roles"
-  #   chef.data_bags_path = "../my-recipes/data_bags"
-  #   chef.add_recipe "mysql"
-  #   chef.add_role "web"
-  #
-  #   # You may also specify custom JSON attributes:
-  #   chef.json = { :mysql_password => "foo" }
-  # end
-
-  # Enable provisioning with chef server, specifying the chef server URL,
-  # and the path to the validation key (relative to this Vagrantfile).
-  #
-  # The Opscode Platform uses HTTPS. Substitute your organization for
-  # ORGNAME in the URL and validation key.
-  #
-  # If you have your own Chef Server, use the appropriate URL, which may be
-  # HTTP instead of HTTPS depending on your configuration. Also change the
-  # validation key to validation.pem.
-  #
-  # config.vm.provision "chef_client" do |chef|
-  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
-  #   chef.validation_key_path = "ORGNAME-validator.pem"
-  # end
-  #
-  # If you're using the Opscode platform, your validator client is
-  # ORGNAME-validator, replacing ORGNAME with your organization name.
-  #
-  # If you have your own Chef Server, the default validation client name is
-  # chef-validator, unless you changed the configuration.
-  #
-  #   chef.validation_client_name = "ORGNAME-validator"
-end

data/example/cookbooks/app/recipes/default.rb

@@ -1,36 +0,0 @@
-include_recipe 'apt'
-
-package 'python-software-properties' do
-  action :install
-end
-
-execute 'apt-add-repository ppa:brightbox/ruby-ng && apt-get update'
-
-package 'build-essential' do
-  action :install
-end
-
-package 'ruby2.1' do
-  action :install
-end
-
-package 'ruby2.1-dev' do
-  action :install
-end
-
-execute 'gem install bundler' do
-  not_if "gem list | grep -q 'bundler '"
-end
-
-execute 'bundle install' do
-  cwd '/vagrant/sinatra_app'
-end
-
-execute "kill $(cat /tmp/thin.pid) && sleep 2" do
-  only_if "test -e /tmp/thin.pid"
-end
-
-execute "bundle exec thin start --pid /tmp/thin.pid --daemonize --port 80" do
-  cwd '/vagrant/sinatra_app'
-end
-

data/example/cookbooks/db/files/default/my.cnf

@@ -1,127 +0,0 @@
-#
-# The MySQL database server configuration file.
-#
-# You can copy this to one of:
-# - "/etc/mysql/my.cnf" to set global options,
-# - "~/.my.cnf" to set user-specific options.
-# 
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# escpecially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-[client]
-port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
-
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
-
-# This was formally known as [safe_mysqld]. Both versions are currently parsed.
-[mysqld_safe]
-socket		= /var/run/mysqld/mysqld.sock
-nice		= 0
-
-[mysqld]
-#
-# * Basic Settings
-#
-user		= mysql
-pid-file	= /var/run/mysqld/mysqld.pid
-socket		= /var/run/mysqld/mysqld.sock
-port		= 3306
-basedir		= /usr
-datadir		= /var/lib/mysql
-tmpdir		= /tmp
-lc-messages-dir	= /usr/share/mysql
-skip-external-locking
-#
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-bind-address		= 0.0.0.0
-#
-# * Fine Tuning
-#
-key_buffer		= 16M
-max_allowed_packet	= 16M
-thread_stack		= 192K
-thread_cache_size       = 8
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched
-myisam-recover         = BACKUP
-#max_connections        = 100
-#table_cache            = 64
-#thread_concurrency     = 10
-#
-# * Query Cache Configuration
-#
-query_cache_limit	= 1M
-query_cache_size        = 16M
-#
-# * Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file        = /var/log/mysql/mysql.log
-#general_log             = 1
-#
-# Error log - should be very few entries.
-#
-log_error = /var/log/mysql/error.log
-#
-# Here you can see queries with especially long duration
-#log_slow_queries	= /var/log/mysql/mysql-slow.log
-#long_query_time = 2
-#log-queries-not-using-indexes
-#
-# The following can be used as easy to replay backup logs or for replication.
-# note: if you are setting up a replication slave, see README.Debian about
-#       other settings you may need to change.
-#server-id		= 1
-#log_bin			= /var/log/mysql/mysql-bin.log
-expire_logs_days	= 10
-max_binlog_size         = 100M
-#binlog_do_db		= include_database_name
-#binlog_ignore_db	= include_database_name
-#
-# * InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-#
-# * Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
-
-
-
-[mysqldump]
-quick
-quote-names
-max_allowed_packet	= 16M
-
-[mysql]
-#no-auto-rehash	# faster start of mysql but no tab completition
-
-[isamchk]
-key_buffer		= 16M
-
-#
-# * IMPORTANT: Additional settings that can override those from this file!
-#   The files must end with '.cnf', otherwise they'll be ignored.
-#
-!includedir /etc/mysql/conf.d/