infrataster 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09a246ee278ac5692659d4002fbe88abe092955d
-  data.tar.gz: b410d985ebfd8285de301a37bf5e539d81216336
+  metadata.gz: b50f39082b28b0195fa82e039f6408776186cc96
+  data.tar.gz: 6d8297343a434ce01ef1e3fe5551ede852584365
 SHA512:
-  metadata.gz: c821d85b3b61b7869f07d5e1394ad5fe534727e03f39885149c4d06b4beab92eb277da764c9109629422479f6eadfcd36debf2d043f5129fb755b3f938269b87
-  data.tar.gz: 3264f6f21d6f416ac97316a7b10fd39f88bd25260cd17d9d14c3c73237ca5a71c802c8f35741f890828ff5f91c95f8f2cb3dead15115366205fdb47d9e6fecf1
+  metadata.gz: f7a6962125a06db963a54f2057f94be3b2389a748e463e4a9be62c69e6cf0557b819d5161b8719cc48d7a46258de29794b854183dab17d010fd46a6cf03d6892
+  data.tar.gz: 17b4b4cf5b7b858e7d548bcaa12a83a32ceb8826e26150651519f686348ba084a3ba2c24841edfee3cea6ebb178b0ad31b73270f26ee8bd81bd8074e8ec712bc

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Infrataster Changelog
 
+## v0.1.5
+
+* Extract mysql resource to [infrataster-plugin-mysql](https://github.com/ryotarai/infrataster-plugin-mysql).
+
 ## v0.1.4
 
 * Include RSpec::Matchers to use be_xxx matchers. (by @KitaitiMakoto)

data/README.md

@@ -1,6 +1,8 @@
 # Infrataster
 
 [![Gem Version](https://badge.fury.io/rb/infrataster.png)](http://badge.fury.io/rb/infrataster)
+[![Build Status](http://ci.ryotarai.info/buildStatus/icon?job=infrataster)](http://ci.ryotarai.info/job/infrataster/)
+[![Code Climate](https://codeclimate.com/github/ryotarai/infrataster.png)](https://codeclimate.com/github/ryotarai/infrataster)
 
 Infrastructure Behavior Testing Framework.
 
@@ -209,30 +211,7 @@ Infrataster::BrowsermobProxy.bin_path = '/path/to/browsermob/bin/browsermob'
 
 ### `mysql_query` resource
 
-`mysql_query` resource tests responce for mysql query.
-
-```ruby
-describe server(:db) do
-  describe mysql_query('SHOW STATUS') do
-    it 'returns positive uptime' do
-      row = results.find {|r| r['Variable_name'] == 'Uptime' }
-      expect(row['Value'].to_i).to be > 0
-
-      # `results` is a instance of `Mysql2::Result`
-      # See: https://github.com/brianmario/mysql2
-    end
-  end
-end
-```
-
-You can specify username and password by options passed to `Infrataster::Server.define`:
-
-```ruby
-Infrataster::Server.define(
-  # ...
-  mysql: {user: 'app', password: 'app'}
-)
-```
+`mysql_query` resource is now in [infrataster-plugin-mysql](https://github.com/ryotarai/infrataster-plugin-mysql).
 
 ## Example
 

data/Rakefile

@@ -8,6 +8,10 @@ end
 
 ENV['VAGRANT_CWD'] = File.expand_path('spec/integration/vm')
 
+
+desc 'Run unit and integration tests'
+task :spec => ['spec:unit', 'spec:integration']
+
 namespace :spec do
   RSpec::Core::RakeTask.new("unit") do |task|
     task.pattern = "./spec/unit{,/*/**}/*_spec.rb"
@@ -20,9 +24,11 @@ namespace :spec do
   namespace :integration do
     integration_dir = 'spec/integration'
 
+    desc 'Clean'
     task :clean => ['destroy_vm', 'remove_berks'] do
     end
 
+    desc 'Prepare'
     task :prepare => ['download_browsermob', 'start_vm'] do
     end
 

data/ci/jenkins_build

@@ -11,7 +11,7 @@ def exec(cmd, exit_if_fail = true)
   $?.exitstatus
 end
 
-exec 'bundle install --path=vendor/bundle --jobs=4'
+exec('env USE_SYSTEM_GECODE=1 bundle install --path=vendor/bundle --jobs=4')
 
 exec 'bundle exec rake spec:unit'
 

data/infrataster.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rspec"
   spec.add_runtime_dependency "net-ssh"
   spec.add_runtime_dependency "net-ssh-gateway"
-  spec.add_runtime_dependency "mysql2"
   spec.add_runtime_dependency "capybara"
   spec.add_runtime_dependency "poltergeist"
   spec.add_runtime_dependency "browsermob-proxy"

data/lib/infrataster/contexts/http_context.rb

@@ -4,7 +4,7 @@ module Infrataster
   module Contexts
     class HttpContext < BaseContext
       def response
-        server.gateway_on_from_server(resource.uri.port) do |address, port|
+        server.open_gateway_on_from_server(resource.uri.port) do |address, port|
           url = "#{resource.uri.scheme}://#{address}:#{port}"
 
           conn = Faraday.new(:url => url) do |faraday|

data/lib/infrataster/contexts.rb

@@ -1,7 +1,6 @@
 require 'infrataster/resources'
 require 'infrataster/contexts/base_context'
 require 'infrataster/contexts/http_context'
-require 'infrataster/contexts/mysql_query_context'
 require 'infrataster/contexts/capybara_context'
 
 module Infrataster

data/lib/infrataster/resources.rb

@@ -1,5 +1,4 @@
 require 'infrataster/resources/base_resource'
 require 'infrataster/resources/server_resource'
 require 'infrataster/resources/http_resource'
-require 'infrataster/resources/mysql_query_resource'
 require 'infrataster/resources/capybara_resource'

data/lib/infrataster/server.rb

@@ -2,6 +2,7 @@ require 'tmpdir'
 require 'net/ssh'
 require 'net/ssh/gateway'
 require 'ipaddr'
+require 'shellwords'
 
 module Infrataster
   class Server
@@ -84,23 +85,23 @@ module Infrataster
     end
 
     def open_gateway_on_from_server(port)
-      if from
-        new_port, finalize_proc = from.gateway_open(@address, port)
-        Logger.debug("tunnel: localhost:#{new_port} -> #{from.address} -> #{@address}:#{port}")
-        ['127.0.0.1', new_port, finalize_proc]
+      if block_given?
+        if from
+          from.gateway_open(@address, port) do |new_port|
+            Logger.debug("tunnel: localhost:#{new_port} -> #{from.address} -> #{@address}:#{port}")
+            yield '127.0.0.1', new_port
+          end
+        else
+          yield @address, port
+        end
       else
-        [@address, port, nil]
-      end
-    end
-
-    def gateway_on_from_server(port)
-      if from
-        from.gateway_open(@address, port) do |new_port|
+        if from
+          new_port, finalize_proc = from.gateway_open(@address, port)
           Logger.debug("tunnel: localhost:#{new_port} -> #{from.address} -> #{@address}:#{port}")
-          yield '127.0.0.1', new_port
+          ['127.0.0.1', new_port, finalize_proc]
+        else
+          [@address, port, nil]
         end
-      else
-        yield @address, port
       end
     end
 
@@ -110,32 +111,40 @@ module Infrataster
 
     private
 
-
     def _ssh_start_args
       config = {}
+
       if @options[:ssh]
         config = @options[:ssh]
+        config[:host] ||= @address
       elsif @options[:vagrant]
-        if @options[:vagrant] != true
-          vagrant_name = @options[:vagrant]
-        else
-          vagrant_name = @name
-        end
-
-        Dir.mktmpdir do |dir|
-          output = File.join(dir, 'ssh-config')
-          `/usr/bin/vagrant ssh-config #{vagrant_name} > #{output}`
-          if $?.exitstatus != 0
-            raise Error, "`vagrant ssh-config` failed. Please check if VMs are running or not."
-          end
-          config = Net::SSH::Config.for(@name.to_s, [output])
-        end
+        vagrant_name = if @options[:vagrant] != true
+                         @options[:vagrant]
+                       else
+                         @name
+                       end
+        config = ssh_config_for_vagrant(vagrant_name)
       else
         raise Error, "Can't get configuration to connect to the server via SSH. Please set ssh option or vagrant option."
       end
 
       [config[:host], config[:user], config]
     end
+
+    def ssh_config_for_vagrant(name)
+      config = nil
+
+      Dir.mktmpdir do |dir|
+        output = File.join(dir, 'ssh-config')
+        `/usr/bin/vagrant ssh-config #{Shellwords.shellescape(name)} > #{Shellwords.shellescape(output)}`
+        if $?.exitstatus != 0
+          raise Error, "`vagrant ssh-config` failed. Please check if VMs are running or not."
+        end
+        config = Net::SSH::Config.for(@name.to_s, [output])
+      end
+
+      config
+    end
   end
 end
 

data/lib/infrataster/version.rb

@@ -1,3 +1,3 @@
 module Infrataster
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/integration/http_spec.rb

@@ -1,12 +1,6 @@
 require 'integration/spec_helper'
 require 'json'
 
-describe 'Normal subject not related to Infrataster' do
-  it "doesn't raise any error" do
-    expect(subject).not_to raise_error
-  end
-end
-
 describe server(:proxy) do
   describe http('http://app.example.com') do
     it "sends GET request with Host header" do

data/spec/integration/other_spec.rb

@@ -0,0 +1,8 @@
+require 'integration/spec_helper'
+
+describe 'Normal subject not related to Infrataster' do
+  it "doesn't raise any error" do
+    expect(subject).not_to raise_error
+  end
+end
+

data/spec/integration/spec_helper.rb

@@ -10,7 +10,6 @@ Infrataster::Server.define(
   '172.16.44.11',
   vagrant: true,
   from: :proxy,
-  mysql: {user: 'app', password: 'app'},
 )
 
 Infrataster::BrowsermobProxy.bin_path = File.expand_path('../vm/vendor/browsermob/bin/browsermob-proxy', __FILE__)

data/spec/integration/vm/Vagrantfile

@@ -17,6 +17,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.box = "hashicorp/precise64"
   end
 
+  if ENV['CI']
+    config.vm.provider "virtualbox" do |v|
+      v.customize ["modifyvm", :id, "--memory", "256"]
+    end
+  end
+
   config.vm.define :proxy do |c|
     c.vm.network "private_network", ip: "192.168.44.10"
     c.vm.network "private_network", ip: INTERNAL_ADDRESSES['proxy'], virtualbox__intnet: "infrataster-integration-test"

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

@@ -33,17 +33,3 @@ end
 
 execute 'supervisorctl restart rackup'
 
-# db
-package 'mysql-server'
-
-service 'mysql' do
-  action :start
-  supports :restart => true
-end
-
-cookbook_file '/etc/mysql/my.cnf' do
-  notifies :restart, 'service[mysql]'
-end
-
-execute "mysql -uroot -e \"GRANT ALL PRIVILEGES ON *.* TO 'app'@'%' IDENTIFIED BY 'app';\""
-

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

@@ -44,6 +44,57 @@ module Infrataster
         expect(gateway).to eq(gateway_mock)
       end
     end
+
+    describe "#_ssh_start_args" do
+      context "with ssh option" do
+        context "when options[:ssh][:host] is set" do
+          it 'returns args for SSH.start' do
+            server = Server.new('name', 'address', ssh: {host: 'host', user: 'user'})
+            expect(server.send(:_ssh_start_args)).
+              to eq(['host', 'user', {host: 'host', user: 'user'}])
+          end
+        end
+
+        context "when options[:ssh][:host] is not set" do
+          it 'returns args for SSH.start' do
+            server = Server.new('name', 'address', ssh: {user: 'user'})
+            expect(server.send(:_ssh_start_args)).
+              to eq(['address', 'user', {host: 'address', user: 'user'}])
+          end
+        end
+      end
+      
+      context "with vagrant option" do
+        context "when vagrant option is true" do
+          it 'returns args for SSH.start' do
+            server = Server.new('name', 'address', vagrant: true)
+            expect(server).to receive(:ssh_config_for_vagrant).with('name').
+              and_return({host: 'host', user: 'user'})
+            expect(server.send(:_ssh_start_args)).
+              to eq(['host', 'user', {host: 'host', user: 'user'}])
+          end
+        end
+
+        context "when vagrant option is not true but truthy" do
+          it 'returns args for SSH.start' do
+            server = Server.new('name', 'address', vagrant: 'vagrant_vm_name')
+            expect(server).to receive(:ssh_config_for_vagrant).with('vagrant_vm_name').
+              and_return({host: 'host', user: 'user'})
+            expect(server.send(:_ssh_start_args)).
+              to eq(['host', 'user', {host: 'host', user: 'user'}])
+          end
+        end
+      end
+
+      context "otherwise" do
+        it 'raises an error' do
+          server = Server.new('name', 'address')
+          expect do
+            server.send(:_ssh_start_args)
+          end.to raise_error(Server::Error)
+        end
+      end
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infrataster
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  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: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +172,6 @@ files:
 - lib/infrataster/contexts/base_context.rb
 - lib/infrataster/contexts/capybara_context.rb
 - 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
@@ -194,14 +179,13 @@ files:
 - 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/version.rb
 - spec/integration/capybara_spec.rb
 - spec/integration/http_spec.rb
-- spec/integration/mysql_query_spec.rb
+- spec/integration/other_spec.rb
 - spec/integration/spec_helper.rb
 - spec/integration/vm/.gitignore
 - spec/integration/vm/Berksfile
@@ -209,7 +193,6 @@ files:
 - spec/integration/vm/app/Gemfile
 - spec/integration/vm/app/app.rb
 - spec/integration/vm/app/config.ru
-- spec/integration/vm/cookbooks/app/files/default/my.cnf
 - 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
@@ -246,7 +229,7 @@ summary: Infrastructure Behavior Testing Framework
 test_files:
 - spec/integration/capybara_spec.rb
 - spec/integration/http_spec.rb
-- spec/integration/mysql_query_spec.rb
+- spec/integration/other_spec.rb
 - spec/integration/spec_helper.rb
 - spec/integration/vm/.gitignore
 - spec/integration/vm/Berksfile
@@ -254,7 +237,6 @@ test_files:
 - spec/integration/vm/app/Gemfile
 - spec/integration/vm/app/app.rb
 - spec/integration/vm/app/config.ru
-- spec/integration/vm/cookbooks/app/files/default/my.cnf
 - 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

data/lib/infrataster/contexts/mysql_query_context.rb

@@ -1,26 +0,0 @@
-require 'mysql2'
-
-module Infrataster
-  module Contexts
-    class MysqlQueryContext < BaseContext
-      def results
-        options = {port: 3306, user: 'root', password: ''}
-        if server.options[:mysql]
-          options = options.merge(server.options[:mysql])
-        end
-
-        server.gateway_on_from_server(options[:port]) do |address, new_port|
-          client = Mysql2::Client.new(
-            host: address,
-            port: new_port,
-            username: options[:user],
-            password: options[:password],
-          )
-          client.query(resource.query)
-        end
-      end
-    end
-  end
-end
-
-

data/lib/infrataster/resources/mysql_query_resource.rb

@@ -1,21 +0,0 @@
-require 'infrataster/resources/base_resource'
-
-module Infrataster
-  module Resources
-    class MysqlQueryResource < BaseResource
-      Error = Class.new(StandardError)
-
-      attr_reader :query
-
-      def initialize(query, options = {})
-        @query = query
-        @options = options
-      end
-
-      def to_s
-        "mysql '#{@query}'"
-      end
-    end
-  end
-end
-

data/spec/integration/mysql_query_spec.rb

@@ -1,11 +0,0 @@
-require 'integration/spec_helper'
-
-describe server(:app) do
-  describe mysql_query('SHOW STATUS') do
-    it 'responds uptime' do
-      row = results.find {|r| r['Variable_name'] == 'Uptime' }
-      expect(row['Value'].to_i).to be > 0
-    end
-  end
-end
-

data/spec/integration/vm/cookbooks/app/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/