machines 0.5.3 → 0.5.4

data/CHANGELOG.md

@@ -1,8 +1,14 @@
+== 0.5.4
+
+* Added support extracting for bz2 archives
+* `install` can now download an archive and extract to /usr/local/lib and create a link in /usr/local/bin
+
+
 == 0.5.3
 
 * Implement `list` command to list available machines from machines.yml
 * Display syntax when `build` called with no machine
-* Support running multiple tasks - e.g. `machines build machine passenger passenger_nginx nginx`
+* Support running multiple tasks - e.g. `machines build machine passenger passenger_nginx nginx webapps`
 * modify git_clone to pull if the repo already exists
 
 == 0.5.2

data/EXAMPLES.md

@@ -23,7 +23,7 @@ Now the drivers for my printer are installed.
 Running individual tasks
 =======================================
 
-Here is an example of upgrading Ruby, passenger and Nginx. First we check what commands will be run with the `dryrun` command.
+Here is an example of upgrading Ruby, passenger and Nginx. First we check what commands will be run with the `dryrun` command. This particular time I was upgrading to Ruby 1.9.3-p194 and the latest passenger (3.0.17) and Nginx (1.2.3).
 
     machines dryrun phil rbenv passenger passenger_nginx nginx webapps
     cat log/output.log
@@ -39,3 +39,5 @@ We can see that git and curl are installed as part of the rbenv install (althoug
 All looks good so we'll run the build:
 
     machines build phil rbenv passenger passenger_nginx nginx webapps
+
+Everything gets reinstalled and reconfigured and we can carry on. `sudo restart nginx` may be required.

data/lib/machines/file_operations.rb

@@ -63,7 +63,7 @@ module Machines
 
     # Rename a remote file or folder
     # @param [String] oldname Existing filename
-    # @param [String] newname Rename to this =
+    # @param [String] newname Rename to this
     def rename oldname, newname
       Command.new("mv -f #{oldname} #{newname}", check_file(newname))
     end

data/lib/machines/installation.rb

@@ -1,5 +1,7 @@
 module Machines
   module Installation
+    include FileOperations
+
     APTGET_QUIET = 'apt-get -q -y'
 
     # Adds a PPA source and updates apt
@@ -45,13 +47,21 @@ module Machines
       Command.new(command, check)
     end
 
-    # Download, extract, and remove an archive. Currently supports `zip` or `tar.gz`.
+    # Download, extract, and remove an archive. Currently supports `zip`, `tar.gz`, `tar.bz2`.
     # @param [String] package Package name to extract
     # @param [Hash] options
     # @option options [Optional String] :to folder to clone or extract to (defaults to /usr/local/src)
     def extract package, options = {}
       name = File.basename(package)
-      cmd = package[/.zip/] ? 'unzip -qq' : 'tar -zxf'
+      if package[/.zip/]
+        cmd = 'unzip -qq'
+      elsif package[/.tar.gz/]
+        cmd = 'tar -zxf'
+      elsif package[/.tar.bz2/]
+        cmd = 'tar -jxf'
+      else
+        raise "extract: Unknown extension for #{package}"
+      end
       dir = cmd =~ /unzip/ ? File.basename(name, '.zip') : File.basename(name).gsub(/\.tar.*/, '')
       dest = options[:to] || '/usr/local/src'
       Command.new("cd #{dest} && wget #{package} && #{cmd} #{name} && rm #{name} && cd -", check_dir("#{File.join(dest, dir)}"))
@@ -95,13 +105,17 @@ module Machines
     # (See `extract` to just uncompress tar.gz or zip files)
     # @param [Symbol, String, Array] packages can be:
     #   URL::
-    #     Download from the specified URL and run `dpkg`
+    #     Download from URL and run `dpkg` (if `:as => :dpkg`)
+    #     Download URL to `/usr/local/lib` and link `:bin` to `/usr/local/bin`
     #   Array or string (with no URL)::
     #     Run `apt` to install specified packages in the array or string
     #       Packages are installed separately to aid progress feedback
     #       Ensure this is the main package as dpkg get-selections is used to validate installation
     #     install %w(build-essential libssl-dev mysql-server) #=> Installs apt packages
     #     install 'http://example.com/my_package.deb', :cleanup => true #=> Installs a deb using dpkg then removes the deb
+    # @param [Hash] options
+    # @option options [Optional Symbol] :as Identify the package type so appropriate command can run. Currently supports `:dpkg` only
+    # @option options [Optional String] :bin Specify the bin file to link to (e.g. '/bin/executable' will create a link /usr/local/bin/executable that points to /usr/local/lib/bin/executable)
     def install packages, options = {}
       if packages.is_a?(String)
         if packages =~ /^http:\/\//
@@ -109,10 +123,15 @@ module Machines
           if packages =~ /\.deb$/i
             name = File.basename(packages)
             commands << Command.new("cd /tmp && wget #{packages} && dpkg -i --force-architecture #{name} && rm #{name} && cd -", nil)
-          else
+          elsif options[:as] == :dpkg
             commands << extract(packages, :to => '/tmp')
             name = File.basename(packages).gsub(/\.(tar|zip).*/, '')
             commands << Command.new("cd /tmp/#{name} && dpkg -i --force-architecture *.deb && cd - && rm -rf /tmp/#{name}", nil)
+          elsif options[:bin]
+            commands << extract(packages, :to => '/tmp')
+            name = File.basename(packages).gsub(/\.(tar|zip).*/, '')
+            commands << rename("/tmp/#{name}", "/usr/local/lib")
+            commands << link("/usr/local/lib/#{name}/#{options[:bin]}", "/usr/local/bin/#{File.basename(options[:bin])}")
           end
           return commands
         else

data/lib/machines/version.rb

@@ -1,4 +1,4 @@
 module Machines
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end
 

data/lib/packages/amazon_mp3.rb

@@ -1,4 +1,4 @@
 task :amazon_mp3, 'Download and install MP3 downloader from Amazon' do
-  sudo install 'http://www.hilltopyodeler.com/packages/AmazonMP3-InstallerForUbuntuNewerThan-9.04.tar.gz'
+  sudo install 'http://www.hilltopyodeler.com/packages/AmazonMP3-InstallerForUbuntuNewerThan-9.04.tar.gz', :as => :dpkg
 end
 

data/spec/lib/machines/installation_spec.rb

@@ -41,9 +41,21 @@ describe 'Installation' do
   end
 
   describe 'extract' do
+    it 'instaniates commands to download, extract and remove a tar.gz archive' do
+      subject = extract 'http://url/package.tar.gz'
+      subject.command.must_equal 'cd /usr/local/src && wget http://url/package.tar.gz && tar -zxf package.tar.gz && rm package.tar.gz && cd -'
+      subject.check.must_equal 'test -d /usr/local/src/package && echo CHECK PASSED || echo CHECK FAILED'
+    end
+
+    it 'instaniates commands to download, extract and remove a tar.bz2 archive' do
+      subject = extract 'http://url/package.tar.bz2'
+      subject.command.must_equal 'cd /usr/local/src && wget http://url/package.tar.bz2 && tar -jxf package.tar.bz2 && rm package.tar.bz2 && cd -'
+      subject.check.must_equal 'test -d /usr/local/src/package && echo CHECK PASSED || echo CHECK FAILED'
+    end
+
     it 'instaniates commands to download, extract and remove a tar archive' do
-      subject = extract 'http://url/package.tar'
-      subject.command.must_equal 'cd /usr/local/src && wget http://url/package.tar && tar -zxf package.tar && rm package.tar && cd -'
+      subject = extract 'http://url/package.tar.gz'
+      subject.command.must_equal 'cd /usr/local/src && wget http://url/package.tar.gz && tar -zxf package.tar.gz && rm package.tar.gz && cd -'
       subject.check.must_equal 'test -d /usr/local/src/package && echo CHECK PASSED || echo CHECK FAILED'
     end
 
@@ -117,28 +129,37 @@ describe 'Installation' do
     end
   end
 
-  describe 'install' do
-    it 'instaniates commands to download, install and remove a DEB package ' do
+  describe 'install instaniates commands to' do
+    it 'download, extract and link to binary executable' do
+      subject = install 'http://some.url/package_name.tar.bz2', :bin => 'bin/package'
+      subject.map(&:command).must_equal [
+        'cd /tmp && wget http://some.url/package_name.tar.bz2 && tar -jxf package_name.tar.bz2 && rm package_name.tar.bz2 && cd -',
+        'mv -f /tmp/package_name /usr/local/lib',
+        'ln -sf /usr/local/lib/package_name/bin/package /usr/local/bin/package'
+      ]
+    end
+
+    it 'download, install and remove a DEB package ' do
       subject = install "http://some.url/package_name.deb"
       subject.map(&:command).must_equal [
         'cd /tmp && wget http://some.url/package_name.deb && dpkg -i --force-architecture package_name.deb && rm package_name.deb && cd -'
       ]
     end
 
-    it 'instaniates commands to download, extract, install and remove a group of DEB packages ' do
-      subject = install "http://some.url/package_name.tar.gz"
+    it 'download, extract, install and remove a group of DEB packages ' do
+      subject = install "http://some.url/package_name.tar.gz", :as => :dpkg
       subject.map(&:command).must_equal [
         'cd /tmp && wget http://some.url/package_name.tar.gz && tar -zxf package_name.tar.gz && rm package_name.tar.gz && cd -',
         'cd /tmp/package_name && dpkg -i --force-architecture *.deb && cd - && rm -rf /tmp/package_name'
       ]
     end
 
-    it 'instaniates a command to install a single apt package' do
+    it 'install a single apt package' do
       subject = install 'package1'
       subject.map(&:command).must_equal ['apt-get -q -y install package1']
     end
 
-    it 'instaniates a command to install multiple apt packages' do
+    it 'install multiple apt packages' do
       subject = install %w(package1 package2)
       subject.map(&:command).must_equal [
         'apt-get -q -y install package1',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: machines
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -520,7 +520,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4483574387537312947
+      hash: -3397019508806936970
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: