contur 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cc15f55274e8ef8636b015778d260048a3739fb
-  data.tar.gz: be421ba4e37075e6487ebfcd8e3a751d8a388d87
+  metadata.gz: cb042d44aa1e032867e8ad81a95008b22af3e7a9
+  data.tar.gz: ac23835185b14d92a970b2e37a6cea8e34196456
 SHA512:
-  metadata.gz: deae55c11f5dadd599a4a21f0c032e5ac5fc5ef474d64a23371c4e784f2971c08d2b12c6a739943455d7f80a845cc3efd09cd30afacaecad60c22a50df382bfe
-  data.tar.gz: 07ca765ae7b0c67252f7936d08f66af3528af0476798b15b6e912aaeac7ceb99be7157f2c18c1960a04d665ecd93c9439b5b8b1100caf5f1178050a861548783
+  metadata.gz: fa56d0229238a88a2c70787f2ac777be7532c5800f1e882fc8944355b6267e6bce1266f3b6aafc2afb03b41431fea2bd5dd36eb791f0b460b113d5d393e80371
+  data.tar.gz: ddad66d481f938304a1ea36c74918b64e45bcc7d4fd3c6b46e3169488ed69c61c86fa85e9872ff303223cd6dfd290f9167735cec55c57c202a243cb18f995c57

data/.travis.yml

@@ -1,5 +1,15 @@
+sudo: required
 language: ruby
 cache: bundler
+services:
+- docker
 rvm:
-  - 2.3.1
-script: bundle exec rake
+- 2.3.1
+before_install:
+- gem install bundler -v '~> 1.13'
+script:
+- bundle exec rake install
+- bundle exec rake
+notifications:
+  slack:
+    secure: evx296qoaGI0URwE8uPixel9z0SEW0nKHb2v5YS2GeCGsyRTS8/p4io9mKByy5iepz4q4vfZuDGIZKPFSxoss0zZ3YR9hJuyxhhzO1PsEYeGitFjdXj4JQ6ENrltyUFybIs90mVCNcxOMTIPDjlbu38KMEEAAWS7Lqz0moppZxowfruWH90ZxF3GbGbotKDNY9sIV3IWvI3louTn834o4NhBK9vP6uS9V7Utyo9uad/ehWKAg8Z4C1mTbhLOjk+v8BJg7X8/4co/A7WoQTY1H7pi+Xs/ZGPYDVTyeQ4lyy1we5/fRiVf67x6S3DrAAMuaknHD8zbZ1E2VxbEvi3XKWPtjqz/QvCgsbNnyKdXiBbeybe1HXX6sWBNBrxKv4nMQ7D5cZy2CpkKAmpbPgrjKYL3gcHD2M6f7LOMZeWQiyZqG9T0rCtqLqLphFbUflnoyhKBk5elm/hNeRw2i81NuYW4ErFAmjyjWg6K0kazFf6EPPLuMUh5ZJ9ERg4mlK4rkCWc+yy8UEyMRVnvAdP4oAXfPHYQNub1vRBHKx9Vx/JFjSglU9olVNl9uJQLTjvdzZs1tAVEUz4DuMKoYZKOpUJovG3KpX8D6VhHe0CwnFfoMHeVuJ4hs9fUzFD+8L/VGmblVYWvoMF1hlknVK9Wo8L4UZfFWUPB/UTJvuBajVc=

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This CHANGELOG follows [Keep a CHANGELOG](http://keepachangelog.com/).
 
+## [0.0.6] - 2017-01-05
+### Added
+- `contur init` command
+- `contur zsh-comp` command
+
 ## [0.0.5] - 2016-11-21
 ### Fixed
 - Typo after successful image build fixed

data/README.md

@@ -5,7 +5,7 @@ Contur is an open-source command line application simplifying your local web dev
 
 [![Gem Version](https://badge.fury.io/rb/contur.svg)](https://badge.fury.io/rb/contur)
 [![Build Status](https://travis-ci.org/Cheppers/contur.svg?branch=master)](https://travis-ci.org/Cheppers/contur)
-[![Coverage Status](https://coveralls.io/repos/github/Cheppers/contur/badge.svg)](https://coveralls.io/github/Cheppers/contur)
+[![Coverage Status](https://coveralls.io/repos/github/Cheppers/contur/badge.svg?branch=master)](https://coveralls.io/github/Cheppers/contur?branch=master)
 
 ## Requirements
 * Ruby 2.3.0+ (recommended installation method [via rvm](https://rvm.io/rvm/install))

data/Rakefile

@@ -2,8 +2,10 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
+require 'cucumber/rake/task'
 
-RuboCop::RakeTask.new(:rubocop) { |task| task.options << '-D' }
+RuboCop::RakeTask.new(:rubocop) { |t| t.options << '-D' }
 RSpec::Core::RakeTask.new(:spec)
+Cucumber::Rake::Task.new(:features) { |t| t.cucumber_opts = '--format pretty' }
 
-task default: [:rubocop, :spec]
+task default: [:rubocop, :spec, :features]

data/bin/contur

@@ -3,8 +3,10 @@
 
 require 'contur'
 require 'colorize'
+require 'fileutils'
 require 'pp'
 require 'thor'
+require 'thor/zsh_completion'
 
 # rubocop:disable Metrics/AbcSize, Metrics/ClassLength
 # Contur CLI
@@ -137,7 +139,7 @@ class ConturCLI < Thor
   desc 'validate', 'Validate build definition file'
   method_option :path,
                 aliases: '-p',
-                default: File.join(Dir.pwd, Dir['.contur.y*ml'].first),
+                default: File.join(Dir.pwd, Dir['.contur.y*ml'].first || ''),
                 desc: 'Build definition file path'
   def validate
     begin
@@ -167,6 +169,42 @@ class ConturCLI < Thor
     end
     exit 1
   end
+
+  desc 'init', 'Initialize .contur.yml file'
+  method_option :'dry-run',
+                aliases: '-d',
+                type: :boolean,
+                default: false,
+                desc: "Don't create the file but print the output"
+  def init
+    if File.exist?('.contur.yml') && !options[:'dry-run']
+      puts '.contur.yml already exists'.red
+      exit 11
+    end
+    yml = Contur::Controller.default_yaml
+    IO.write('.contur.yml', yml) unless options[:'dry-run']
+    puts '.contur.yml initialized'.green unless options[:'dry-run']
+    puts yml if options[:'dry-run']
+  end
+
+  desc 'zsh-comp', 'Install zsh completion'
+  def zsh_comp
+    contur_dir = File.join(ENV['HOME'], '.contur')
+    zshrc = File.join(ENV['HOME'], '.zshrc')
+    contur_comp_file = File.join(contur_dir, 'zsh_completion.sh')
+
+    FileUtils.mkdir(contur_dir) unless Dir.exist?(contur_dir)
+
+    puts "Writing completion to #{contur_comp_file}..."
+    File.write(contur_comp_file, Thor::ZshCompletion::Generator.new(ConturCLI, 'contur').generate)
+
+    script_line = "[ -f #{contur_comp_file} ] && source #{contur_comp_file}"
+    unless File.readlines(zshrc).grep(/zsh_completion.sh/).any?
+      File.open(zshrc, 'a+') { |f| f.write("\n#{script_line}\n") }
+    end
+
+    puts "The changes will take effect after you restart your terminal or do a `source #{zshrc}`"
+  end
 end
 
 ConturCLI.start(ARGV)

data/contur.gemspec

@@ -31,12 +31,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'excon', '~> 0.46', '>= 0.46'
   spec.add_dependency 'docker-api', '~> 1.31', '>= 1.31'
   spec.add_dependency 'thor', '~> 0.19'
+  spec.add_dependency 'thor-zsh_completion', '~> 0.1.1'
 
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rubocop', '~> 0.44'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'cucumber', '~> 2.4'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'simplecov', '~> 0.12'
   spec.add_development_dependency 'simplecov-console', '~> 0.3'

data/features/init.feature

@@ -0,0 +1,45 @@
+Feature: init command
+  As a developer
+  The 'contur init' command should initialize a new .contur.yml
+  So I don't have to write it manually at first
+
+  Scenario: No previous .contur.yml in the directory
+    Given I have an empty directory
+    When I run "contur init" in the directory
+    Then I have a new .contur.yml
+    And it contains:
+      """
+      ---
+      version: 1.0
+      php: '5.6'
+      mysql: latest
+      env:
+        CONTUR: true
+      before:
+      - composer install
+      """
+
+  Scenario: Existing .contur.yml in the directory
+    Given I have a directory with .contur.yml
+    When I run "contur init" in the directory
+    Then the CLI returns exit code 11
+    And it prints to the console:
+      """
+      .contur.yml already exists
+      """
+
+  Scenario: Execute a "contur init --dry-run"
+    Given I have an empty directory
+    When I run "contur init --dry-run" in the directory
+    Then I have an empty directory
+    And it prints to the console:
+      """
+      ---
+      version: 1.0
+      php: '5.6'
+      mysql: latest
+      env:
+        CONTUR: true
+      before:
+      - composer install
+      """

data/features/step_definitions/init_steps.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+Given(/^I have an empty directory$/) do
+  expect(Dir.entries(@tmpdir).size).to eq 2
+end
+
+When(/^I run "([^"]*)" in the directory$/) do |command|
+  resp = `cd #{@tmpdir} && #{command}`
+  @response = resp.gsub(/\e\[(\d+)(;\d+)*m/, '').chomp
+end
+
+Then(/^I have a new \.contur\.yml$/) do
+  expect(File.exist?(File.join(@tmpdir, '.contur.yml'))).to be true
+end
+
+Then(/^it contains:$/) do |string|
+  expect(string).to eq IO.read(File.join(@tmpdir, '.contur.yml')).chomp
+end
+
+Given(/^I have a directory with \.contur\.yml$/) do
+  IO.write(File.join(@tmpdir, '.contur.yml'), '')
+  expect(File.exist?(File.join(@tmpdir, '.contur.yml'))).to be true
+end
+
+Then(/^the CLI returns exit code (\d+)$/) do |exit_code|
+  expect($CHILD_STATUS.exitstatus).to eq exit_code.to_i
+end
+
+Then(/^it prints to the console:$/) do |output|
+  expect(@response).to eq output
+end

data/features/step_definitions/version_steps.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+When(/^I call "([^"]*)"$/) do |version_command|
+  @response = `#{version_command}`
+  expect(@response).to_not be_nil
+end
+
+Then(/^Contur tells it's version$/) do
+  expect($CHILD_STATUS.exitstatus).to eq 0
+end

data/features/support/env.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+require 'fileutils'
+require 'rspec'
+require 'English'
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end
+
+Before do
+  @tmpdir = Dir.mktmpdir
+end
+
+After do
+  FileUtils.remove_entry_secure @tmpdir
+end

data/features/version.feature

@@ -0,0 +1,6 @@
+Feature: version check
+  As a developer
+  I want to check the installed version of Contur
+  Scenario:
+    When I call "contur -V"
+    Then Contur tells it's version

data/lib/contur/constants.rb

@@ -22,4 +22,16 @@ module Contur
     php_max_post: '100M',
     extra_files: Contur::TEMPLATE_DIR
   }.freeze
+
+  DEFAULT_YAML ||= {
+    'version' => 1.0,
+    'php' => Contur::DEFAULT_PHP_VERSION,
+    'mysql' => Contur::DEFAULT_MYSQL_VERSION,
+    'env' => {
+      'CONTUR' => true
+    },
+    'before' => [
+      'composer install'
+    ]
+  }.freeze
 end

data/lib/contur/controller.rb

@@ -186,6 +186,10 @@ module Contur
       mysql_containers.select { |c| !c.info['Image'].end_with?(except) }.each(&:stop)
     end
 
+    def self.default_yaml
+      Contur::DEFAULT_YAML.to_yaml
+    end
+
     private_class_method
 
     def self.load_docker_template(template_name, opts = {})

data/lib/contur/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Contur
-  VERSION ||= '0.0.5'
+  VERSION ||= '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contur
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Cheppers Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -78,6 +78,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: thor-zsh_completion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +162,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -216,6 +244,11 @@ files:
 - bin/setup
 - contur-logo.png
 - contur.gemspec
+- features/init.feature
+- features/step_definitions/init_steps.rb
+- features/step_definitions/version_steps.rb
+- features/support/env.rb
+- features/version.feature
 - lib/contur.rb
 - lib/contur/bindable_hash.rb
 - lib/contur/config.rb