marionetta 0.4.8 → 0.4.8.1

data/README.md

@@ -166,17 +166,12 @@ staging.manipulate_each_server(:deployer, :rollback)
 
 ## Upcoming
 
- - Output deploy excludes to tmp file for use with rsync --exclude-from (v0.4.x)
- - Add clean up for deployments (v0.4.x)
- - Add puppet safe-upgrade ability (v0.4.x)
+ - Add permissions with Manipulators::Deployer (v0.4.x)
  - Remove rollback feature... we don't need rollbacks IMO. (v0.5.x)
  - Remove Marionetta::Manipulators::Debloyer (v0.5.x) 
  - Use rye for commands (https://github.com/delano/rye) (v0.5.x)
  - Use a single SSH connection per task (v0.5.x)
- - Add ability to define shared directories with Manipulators::Deployer
- - Add ability to define permissions with Manipulators::Deployer
- - Change :before_script and :after_script to :before_scripts and :after_scripts
-   that take an array
+ - Ensure concurrency is tested and therefore guaranteed (v0.5.x)
 
 ## Author
 

data/Rakefile

@@ -1,6 +1,5 @@
 require 'bundler'
 require 'rspec/core/rake_task'
-require 'marionetta'
 
 Bundler::GemHelper.install_tasks
 RSpec::Core::RakeTask.new(:spec)

data/lib/marionetta.rb

@@ -27,7 +27,7 @@
 # 
 module Marionetta
 
-  VERSION = '0.4.8'
+  VERSION = '0.4.8.1'
 
   ### Defining Servers
 

data/lib/marionetta/directory_sync.rb

@@ -42,10 +42,15 @@ module Marionetta
     end
 
     def rsync_exclude_flags(exclude_files)
-      exclude_files.map! {|f| ['--exclude', f]}
-      exclude_files.flatten!
+      excludes_path = '/tmp/exclude-rsync'
+      excludes_file = File.open(excludes_path, 'w')
 
-      return exclude_files
+      exclude_files.each do |f|
+        excludes_file << "#{f}\n"
+      end
+
+      excludes_file.close
+      return ['--exclude-from', excludes_path]
     end
 
     def sync_dir(from, to, exclude_files = [])

data/lib/marionetta/manipulators/debloyer.rb

@@ -19,6 +19,8 @@ module Marionetta
 
       def initialize(server)
         @server = server
+        server[:logger].warn('You should try Marionetta::Manipulators::Deployer')
+        server[:logger].warn('Debloyer (thats Deb) is now deprecated and will be removed in v0.5.x')
       end
 
       def can?()
@@ -90,4 +92,4 @@ module Marionetta
       end
     end
   end
-end
+end

data/lib/marionetta/manipulators/deployer.rb

@@ -54,16 +54,22 @@ module Marionetta
 
       ### Deploying
 
-      # Call `.deploy()` to run a deploy to your remote
-      # server. The process involves:
+      # Setup deploy environment on remote server.
+      # 
+      def setup()
+        create_directories
+      end
+
+      # Run a deploy to your remote server. The process
+      # involves:
       # 
       #  - `:from` directory rsync'd to remote cache directory
       #    with `:exclude` files being ignored
       #  - cache directory copied on remote machine to
       #    releases directory
-      #  - `:before_script` run
+      #  - `:before_script` and `:before_scripts` run
       #  - release directory symlinked to a current directory
-      #  - `:after_script` run
+      #  - `:after_script` and `:before_scripts` run
       # 
       # The directory structure under `server[:deployer][:to]`
       # looks something like this:
@@ -80,26 +86,33 @@ module Marionetta
         DirectorySync.sync(server, from_dir, cache_dir, server[:deployer])
         copy_cache_dir_to_release(release)
 
+        symlink_shared_directories(release)
+
         send_scripts()
         run_script(:before, release)
         symlink_release_dir(release)
         run_script(:after, release)
       end
 
-      # To get an array of all releases call `.releases()`.
-      # Any release that is subsequently rolled back will not
-      # be listed.
+      # Get an array of all releases including those which
+      # have been rolled back (skipped).
       # 
-      def releases()
-        releases = []
+      def releases_including_skipped()
+        files = []
 
         cmd.ssh("ls -m #{releases_dir}") do |stdout|
-          stdout.read.split(/[,\s]+/).each do |release|
-            releases << release unless release.index('skip-') == 0
-          end
+          files.concat(stdout.read.split(/[,\s]+/))
         end
 
-        return releases
+        return files
+      end
+
+      # Get an array of all releases call `.releases()`. Any
+      # release that is subsequently rolled back will not
+      # be listed.
+      # 
+      def releases()
+        releases_including_skipped.delete_if {|r| r =~ /^skip-/}
       end
 
       # If you push out and need to rollback to the previous
@@ -119,6 +132,16 @@ module Marionetta
         end
       end
 
+      # Delete release directories on remote machine.
+      # 
+      def clean()
+        rels = releases()
+        rels.pop()
+        rm = ['rm', '-r'].concat(rels.map {|r| release_dir(r)})
+        rm << release_dir('skip-*')
+        cmd.ssh(rm)
+      end
+
     private
 
       def from_dir()
@@ -141,6 +164,10 @@ module Marionetta
         "#{to_dir}/cache"
       end
 
+      def shared_dir()
+        "#{to_dir}/shared"
+      end
+
       def releases_dir()
         "#{to_dir}/releases"
       end
@@ -153,6 +180,24 @@ module Marionetta
         "#{to_dir}/current"
       end
 
+      def install_dir_cmd(dir)
+        owner = 'www-data'
+        group = 'www-data'
+        chmod = '775'
+
+        return "install -d #{dir} -o #{owner} -g #{group} -m #{chmod}"
+      end
+
+      def create_directories()
+        install = [install_dir_cmd(releases_dir), install_dir_cmd(cache_dir)]
+        
+        if server[:deployer].has_key?(:shared_directories)
+          install << install_dir_cmd(shared_dir)
+        end
+
+        cmd.ssh(install)
+      end
+
       def create_release_name()
         name = timestamp
 
@@ -173,14 +218,37 @@ module Marionetta
         cmd.ssh("mkdir -p #{releases_dir} && cp -r #{cache_dir} #{release_dir}")
       end
 
+      def symlink_shared_directories(release)
+        return unless server[:deployer].has_key?(:shared_directories)
+
+        release_dir = release_dir(release)
+        cmds = []
+
+        server[:deployer][:shared_directories].each do |d|
+          to = "#{release_dir}/#{d}"
+          from = "#{shared_dir}/#{d}"
+
+          cmds << "rm -r #{to}"
+          cmds << "mkdir -p #{from}"
+          cmds << "ln -s #{from} #{to}"
+        end
+
+        cmd.ssh(cmds.join(' && '))
+      end
+
       def send_scripts()
         files = []
 
         [:before, :after].each do |script|
-          script_key = "#{script}_script".to_sym
+          singular_script_key = "#{script}_script".to_sym
+          plural_script_key = "#{script}_scripts".to_sym
+
+          if server[:deployer].has_key?(singular_script_key)
+            files << server[:deployer][singular_script_key]
+          end
 
-          if server[:deployer].has_key?(script_key)
-            files << server[:deployer][script_key]
+          if server[:deployer].has_key?(plural_script_key)
+            files.concat(server[:deployer][plural_script_key])
           end
         end
 

data/lib/marionetta/manipulators/puppet.rb

@@ -54,7 +54,9 @@ module Marionetta
       # to install puppet on debian or ubuntu servers.
       # 
       def install()
-        unless server[:puppet].has_key?(:use_distro_repo) and server[:puppet][:use_distro_repo] == true
+        p = server[:puppet]
+        
+        unless p.has_key?(:use_distro_repo) and p[:use_distro_repo] == true
           install_deb_repo
         end
 

data/lib/marionetta/rake_helper.rb

@@ -6,7 +6,6 @@
 # 
 require 'marionetta'
 require 'marionetta/manipulators'
-require 'rake'
 
 module Marionetta
   module RakeHelper

data/spec/app/after2

@@ -0,0 +1 @@
+echo 'Cool'

data/spec/deployer_spec.rb

@@ -11,17 +11,25 @@ def cmd()
 end
 
 describe Marionetta::Manipulators::Deployer do
-  it 'should deploy' do
+  it 'should setup' do
     cmd.ssh('rm -rf ~/app')
+    deployer.setup
+    cmd.ssh("[ -d ~/app/releases ]").should == true
+    cmd.ssh("[ -d ~/app/shared ]").should == true
+    cmd.ssh("[ -d ~/app/cache ]").should == true
+  end
+  
+  it 'should deploy' do
     deployer.deploy
     deployer.deploy
     cmd.ssh("[ -L ~/app/current ]").should == true
-    cmd.ssh("[ -d ~/app/releases ]").should == true
     cmd.ssh("[ -f ~/app/current/app.rb ]").should == true
     cmd.ssh("[ -f ~/app/current/app-copy.rb ]").should == true
     cmd.ssh("[ -f ~/app/current/exclude.txt ]").should_not == true
     cmd.ssh("[ -f ~/app/current/exclude/another.txt ]").should_not == true
     cmd.ssh("[ -f ~/app/current/after ]").should_not == true
+    cmd.ssh("[ -f ~/app/current/after2 ]").should_not == true
+    cmd.ssh("[ -L ~/app/current/logs ]").should == true
   end
 
   it 'should list releases' do
@@ -31,4 +39,9 @@ describe Marionetta::Manipulators::Deployer do
   it 'should rollback' do
     deployer.rollback
   end
+
+  it 'should clean up' do
+    deployer.clean
+    deployer.releases_including_skipped.length.should == 1
+  end
 end

data/spec/spec_helper.rb

@@ -22,8 +22,10 @@ def server()
 
   s[:deployer][:from] = app_dir
   s[:deployer][:to] = '~/app'
-  s[:deployer][:exclude] = ['exclud*', 'before', 'after']
+  s[:deployer][:exclude] = ['exclud*', 'before', 'after*']
   s[:deployer][:after_script] = "#{app_dir}/after"
+  s[:deployer][:after_scripts] = ["#{app_dir}/after2"]
+  s[:deployer][:shared_directories] = ['logs']
 
   s[:debloyer][:from] = app_dir
   s[:debloyer][:to] = '~/app-deb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marionetta
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
@@ -150,6 +150,7 @@ files:
 - lib/marionetta/rake_helper.rb
 - marionetta.gemspec
 - spec/app/after
+- spec/app/after2
 - spec/app/app.rb
 - spec/app/exclude.txt
 - spec/app/exclude/another.txt
@@ -179,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3588169205023904270
+      hash: 2416169289769076479
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -188,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3588169205023904270
+      hash: 2416169289769076479
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -197,6 +198,7 @@ specification_version: 3
 summary: Provision using puppet and deploy your servers over SSH.
 test_files:
 - spec/app/after
+- spec/app/after2
 - spec/app/app.rb
 - spec/app/exclude.txt
 - spec/app/exclude/another.txt