blazing 0.4.2 → 0.5.0

data/spec/blazing/integration/setup_spec.rb

@@ -1,41 +1,41 @@
 require 'spec_helper'
+require 'blazing/config'
+require 'blazing/cli'
+require 'blazing/dsl'
 
 describe '$ blazing setup' do
-
+  before :each do
+    setup_sandbox
+    @config = Blazing::Config.new
+    @config.targets << Blazing::Target.new(:production, "#{@sandbox_directory}/production", @config)
+    @config.targets << Blazing::Target.new(:staging, "#{@sandbox_directory}/staging", @config)
+    @cli = Blazing::CLI.new
+    allow(Blazing::Config).to receive(:parse).and_return @config
+  end
+
+  after :each do
+    teardown_sandbox
+  end
+
+  context 'when a target is specified' do
     before :each do
-      setup_sandbox
-      @config = Blazing::Config.new
-      @config.target :production, "#{@sandbox_directory}/target"
-      @config.target :staging, "#{@sandbox_directory}/staging"
-      @cli = Blazing::CLI.new
-      Blazing::Config.stub(:parse).and_return @config
+      capture(:stdout, :stderr) { @cli.setup(:production) }
     end
 
-    after :each do
-      teardown_sandbox
+    it 'prepares the repository on the target location' do
+      expect(File.exist?("#{@sandbox_directory}/production/.git")).to be true
     end
 
-    context 'when a target is specified' do
-
-      before :each do
-        capture(:stdout, :stderr) { @cli.setup(:production) }
-      end
-
-      it 'prepares the repository on the target location' do
-        File.exists?("#{@sandbox_directory}/target/.git").should be true
-      end
-
-      it 'configures the repository to allow pushing to the checked out branch' do
-        Grit::Repo.new("#{@sandbox_directory}/target").config['receive.denycurrentbranch'].should == 'ignore'
-      end
+    it 'configures the repository to allow pushing to the checked out branch' do
+      expect(Grit::Repo.new("#{@sandbox_directory}/production").config['receive.denycurrentbranch']).to eq('ignore')
     end
+  end
 
-    context 'when all is specified as target' do
-      it 'updates all targets' do
-        capture(:stdout, :stderr) { @cli.setup('all') }
-        File.exists?("#{@sandbox_directory}/target/.git/hooks/post-receive").should be true
-        File.exists?("#{@sandbox_directory}/staging/.git/hooks/post-receive").should be true
-      end
+  context 'when all is specified as target' do
+    it 'updates all targets' do
+      capture(:stdout, :stderr) { @cli.setup('all') }
+      expect(File.exist?("#{@sandbox_directory}/production/.git/hooks/post-receive")).to be true
+      expect(File.exist?("#{@sandbox_directory}/staging/.git/hooks/post-receive")).to be true
     end
- end
-
+  end
+end

data/spec/blazing/integration/update_spec.rb

@@ -1,43 +1,43 @@
 require 'spec_helper'
+require 'blazing/config'
+require 'blazing/cli'
 
 describe '$ blazing update' do
-
+  before :each do
+    setup_sandbox
+    @config = Blazing::Config.new
+    @config.targets << Blazing::Target.new(:production, "#{@sandbox_directory}/production", @config)
+    @config.targets << Blazing::Target.new(:staging, "#{@sandbox_directory}/staging", @config)
+    @cli = Blazing::CLI.new
+    allow(Blazing::Config).to receive(:parse).and_return @config
+    allow(Blazing::Config).to receive(:parse).and_return @config
+  end
+
+  after :each do
+    teardown_sandbox
+  end
+
+  context 'when a target is specified' do
     before :each do
-      setup_sandbox
-      @config = Blazing::Config.new
-      @config.target :production, "#{@sandbox_directory}/target"
-      @config.target :staging, "#{@sandbox_directory}/staging"
-      @cli = Blazing::CLI.new
-      Blazing::Config.stub(:parse).and_return @config
+      capture(:stdout, :stderr) { @cli.setup(:production) }
+      capture(:stdout, :stderr) { @cli.update(:production) }
     end
 
-    after :each do
-      teardown_sandbox
+    it 'generates a post-receive hook based on the current blazing config' do
+      expect(File.exist?('/tmp/post-receive')).to be true
     end
 
-   context 'when a target is specified' do
-
-     before :each do
-       capture(:stdout, :stderr) { @cli.setup(:production) }
-       capture(:stdout, :stderr) { @cli.update(:production) }
-     end
-
-     it 'generates a post-receive hook based on the current blazing config' do
-       File.exists?("/tmp/post-receive").should be true
-     end
-
-     it 'copies the generated post-receive hook to the target' do
-       File.exists?("#{@sandbox_directory}/target/.git/hooks/post-receive").should be true
-     end
-   end
-
-   context 'when all is specified as target' do
-     it 'updates all targets' do
-       capture(:stdout, :stderr) { @cli.setup('all') }
-       capture(:stdout, :stderr) { @cli.update('all') }
-       File.exists?("#{@sandbox_directory}/target/.git/hooks/post-receive").should be true
-       File.exists?("#{@sandbox_directory}/staging/.git/hooks/post-receive").should be true
-     end
-   end
- end
-
+    it 'copies the generated post-receive hook to the target' do
+      expect(File.exist?("#{@sandbox_directory}/production/.git/hooks/post-receive")).to be true
+    end
+  end
+
+  context 'when all is specified as target' do
+    it 'updates all targets' do
+      capture(:stdout, :stderr) { @cli.setup('all') }
+      capture(:stdout, :stderr) { @cli.update('all') }
+      expect(File.exist?("#{@sandbox_directory}/production/.git/hooks/post-receive")).to be true
+      expect(File.exist?("#{@sandbox_directory}/staging/.git/hooks/post-receive")).to be true
+    end
+  end
+end

data/spec/blazing/logger_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 module Blazing
-
   describe Logger do
-
     let(:logger) { Logger.new }
     let(:dummy) { class Dummy; include Logger; end }
 
@@ -27,8 +25,6 @@ module Blazing
       it 'for fatal messages' do
         dummy.respond_to? :fatal
       end
-
     end
   end
 end
-

data/spec/blazing/repository_spec.rb

@@ -1,40 +1,38 @@
 require 'spec_helper'
+require 'blazing/repository'
 
 module Blazing
-
   describe Repository do
-
-    let(:shell_probe) { double(:shell, :run => nil) }
+    let(:shell_probe) { double(:shell, run: nil) }
 
     describe '#setup' do
       it 'initializes and sets up the repository over ssh' do
-        target = double(:target, :host => 'host', :user => 'user', :path => '/some/where')
+        target = double(:target, host: 'host', user: 'user', path: '/some/where')
         repository = Repository.new(target)
         repository.instance_variable_set(:@shell, shell_probe)
 
-        shell_probe.should_receive(:run).with("ssh user@host 'mkdir /some/where; cd /some/where && git init && cd /some/where && git config receive.denyCurrentBranch ignore'")
+        expect(shell_probe).to receive(:run).with("ssh user@host 'mkdir /some/where; cd /some/where && git init && cd /some/where && git config receive.denyCurrentBranch ignore'")
         repository.setup
       end
 
       it 'initializes and sets up the repository locally when no host provided' do
-        target = double(:target, :host => nil, :user => 'user', :path => '/some/where')
+        target = double(:target, host: nil, user: 'user', path: '/some/where')
         repository = Repository.new(target)
         repository.instance_variable_set(:@shell, shell_probe)
 
-        shell_probe.should_receive(:run).with("mkdir /some/where; cd /some/where && git init && cd /some/where && git config receive.denyCurrentBranch ignore")
+        expect(shell_probe).to receive(:run).with('mkdir /some/where; cd /some/where && git init && cd /some/where && git config receive.denyCurrentBranch ignore')
         repository.setup
       end
     end
 
     describe '#add_git_remote' do
-
-      let(:target) { double(:target, :host => 'host', :user => 'user', :path => '/some/where', :name => :foo, :location => '/url/for/git/remote') }
+      let(:target) { double(:target, host: 'host', user: 'user', path: '/some/where', name: :foo, location: '/url/for/git/remote') }
       let(:repository) { Repository.new(target) }
       let(:grit_object) { repository.instance_variable_get(:@grit_object) }
 
       it 'adds a git remote for the target' do
         repository.add_git_remote
-        grit_object.config["remote.#{target.name}.url"].should == target.location
+        expect(grit_object.config["remote.#{target.name}.url"]).to eq(target.location)
       end
     end
   end

data/spec/blazing/shell_spec.rb

@@ -1,14 +1,13 @@
 require 'spec_helper'
+require 'blazing/shell'
 
 module Blazing
-
   describe Shell do
-
     let(:shell) { Shell.new }
 
     describe '#run' do
       it 'runs the provided command' do
-        shell.should_receive(:`)
+        expect(shell).to receive(:`)
         shell.run('command')
       end
 
@@ -16,4 +15,3 @@ module Blazing
     end
   end
 end
-

data/spec/blazing/target_spec.rb

@@ -2,47 +2,46 @@ require 'spec_helper'
 require 'blazing/target'
 
 describe Blazing::Target do
-
   describe '#name' do
     it 'returns the name of the target' do
-      Blazing::Target.new(:sometarget, 'location', :blah => 'blah').name.should be :sometarget
+      expect(Blazing::Target.new(:sometarget, 'location', blah: 'blah').name).to be :sometarget
     end
   end
 
   describe '#options' do
     it 'returns the options hash' do
-      Blazing::Target.new(:sometarget, 'location', :blah => 'blah').options.should be_a Hash
+      expect(Blazing::Target.new(:sometarget, 'location', blah: 'blah').options).to be_a Hash
     end
   end
 
   describe '#path' do
     it 'extracts the path from the location' do
-      target = Blazing::Target.new(:sometarget, 'user@host:/path', :blah => 'blah')
-      target.path.should == '/path'
+      target = Blazing::Target.new(:sometarget, 'user@host:/path', blah: 'blah')
+      expect(target.path).to eq('/path')
     end
   end
 
   describe '#host' do
     it 'extracts the host from the location' do
-      target = Blazing::Target.new(:sometarget, 'user@host:/path', :blah => 'blah')
-      target.host.should == 'host'
+      target = Blazing::Target.new(:sometarget, 'user@host:/path', blah: 'blah')
+      expect(target.host).to eq('host')
     end
 
     it 'returns nil when host is not present' do
-      target = Blazing::Target.new(:sometarget, '/path', :blah => 'blah')
-      target.host.should == nil
+      target = Blazing::Target.new(:sometarget, '/path', blah: 'blah')
+      expect(target.host).to be_nil
     end
   end
 
   describe '#user' do
     it 'extracts the user from the location' do
-      target = Blazing::Target.new(:sometarget, 'user@host:/path', :blah => 'blah')
-      target.user.should == 'user'
+      target = Blazing::Target.new(:sometarget, 'user@host:/path', blah: 'blah')
+      expect(target.user).to eq('user')
     end
 
     it 'returns nil user is not present' do
-      target = Blazing::Target.new(:sometarget, '/path', :blah => 'blah')
-      target.user.should == nil
+      target = Blazing::Target.new(:sometarget, '/path', blah: 'blah')
+      expect(target.user).to be_nil
     end
   end
 end

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@ require 'blazing'
 require 'rspec'
 require 'stringio'
 require 'pry'
+require 'logging'
+require 'blazing/logger'
 
 ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 
@@ -9,6 +11,7 @@ ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File:
 # Stuff borrowed from carlhuda/bundler
 #
 RSpec.configure do |config|
+  config.warnings = false
 
   #
   # Reset Logger
@@ -16,16 +19,16 @@ RSpec.configure do |config|
   Logging.appenders.reset
   Logging.appenders.string_io(
     'string_io',
-    :layout => Logging.layouts.pattern(
-      :pattern => ' ------> [blazing] %-5l: %m\n',
-      :color_scheme => 'bright'
+    layout: Logging.layouts.pattern(
+      pattern: ' ------> [blazing] %-5l: %m\n',
+      color_scheme: 'bright'
     )
   )
 
   Logging.logger.root.appenders = 'string_io'
 
   def capture(*streams)
-    streams.map! { |stream| stream.to_s }
+    streams.map!(&:to_s)
     begin
       result = StringIO.new
       streams.each { |stream| eval "$#{stream} = result" }
@@ -41,7 +44,7 @@ RSpec.configure do |config|
     @sandbox_directory = File.join('/tmp/blazing_sandbox')
 
     # Sometimes, when specs failed, the sandbox would stick around
-    FileUtils.rm_rf(@sandbox_directory) if File.exists?(@sandbox_directory)
+    FileUtils.rm_rf(@sandbox_directory) if File.exist?(@sandbox_directory)
 
     # Setup Sandbox and cd into it
     Dir.mkdir(@sandbox_directory)
@@ -68,11 +71,4 @@ RSpec.configure do |config|
   def spec_root
     File.dirname(__FILE__)
   end
-
-  #def prepare_sample_config
-    #sample_config = File.join(spec_root, 'support', 'sample_config_1.rb')
-    #Dir.mkdir(@sandbox_directory + '/config')
-    #FileUtils.cp(sample_config, @sandbox_directory + '/config/blazing.rb')
-  #end
-
 end

data/spec/support/dummy_config.rb

@@ -0,0 +1,6 @@
+target :staging, 'user@server:/var/www/someproject.com',
+       rails_env: 'production'
+
+env_script '/etc/profile.d/rbenv.sh'
+
+rake :post_deploy

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: blazing
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Felipe Kaufmann
+- Alexander Adam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-28 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -44,14 +45,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -137,13 +138,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: grit
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -151,21 +152,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: logging
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: thor
+  name: grit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +166,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +180,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -215,6 +202,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".rvmrc"
 - ".travis.yml"
 - CHANGELOG.md
@@ -230,10 +218,9 @@ files:
 - lib/blazing/cli.rb
 - lib/blazing/commands.rb
 - lib/blazing/config.rb
-- lib/blazing/dsl_setter.rb
+- lib/blazing/dsl.rb
 - lib/blazing/hook.rb
 - lib/blazing/logger.rb
-- lib/blazing/recipe.rb
 - lib/blazing/repository.rb
 - lib/blazing/shell.rb
 - lib/blazing/target.rb
@@ -243,26 +230,24 @@ files:
 - lib/blazing/templates/hook/env-scripts.erb
 - lib/blazing/templates/hook/git-reset.erb
 - lib/blazing/templates/hook/rake.erb
-- lib/blazing/templates/hook/recipes.erb
 - lib/blazing/templates/hook/rvm.erb
 - lib/blazing/templates/hook/setup.erb
+- lib/blazing/version.rb
 - spec/blazing/cli_spec.rb
 - spec/blazing/commands_spec.rb
 - spec/blazing/config_spec.rb
-- spec/blazing/dsl_setter_spec.rb
+- spec/blazing/dsl_spec.rb
 - spec/blazing/hook_spec.rb
 - spec/blazing/integration/deployment_spec.rb
 - spec/blazing/integration/init_spec.rb
-- spec/blazing/integration/list_spec.rb
-- spec/blazing/integration/recipes_spec.rb
 - spec/blazing/integration/setup_spec.rb
 - spec/blazing/integration/update_spec.rb
 - spec/blazing/logger_spec.rb
-- spec/blazing/recipe_spec.rb
 - spec/blazing/repository_spec.rb
 - spec/blazing/shell_spec.rb
 - spec/blazing/target_spec.rb
 - spec/spec_helper.rb
+- spec/support/dummy_config.rb
 - spec/support/empty_config.rb
 - spec/support/gemfile_with_comments
 - spec/support/gemfile_with_versions
@@ -278,7 +263,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -294,20 +279,18 @@ test_files:
 - spec/blazing/cli_spec.rb
 - spec/blazing/commands_spec.rb
 - spec/blazing/config_spec.rb
-- spec/blazing/dsl_setter_spec.rb
+- spec/blazing/dsl_spec.rb
 - spec/blazing/hook_spec.rb
 - spec/blazing/integration/deployment_spec.rb
 - spec/blazing/integration/init_spec.rb
-- spec/blazing/integration/list_spec.rb
-- spec/blazing/integration/recipes_spec.rb
 - spec/blazing/integration/setup_spec.rb
 - spec/blazing/integration/update_spec.rb
 - spec/blazing/logger_spec.rb
-- spec/blazing/recipe_spec.rb
 - spec/blazing/repository_spec.rb
 - spec/blazing/shell_spec.rb
 - spec/blazing/target_spec.rb
 - spec/spec_helper.rb
+- spec/support/dummy_config.rb
 - spec/support/empty_config.rb
 - spec/support/gemfile_with_comments
 - spec/support/gemfile_with_versions