brick_and_mortar 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0a832c15da1ec2ebcad40df466335b36434abd4
-  data.tar.gz: 6021f5e00022c249666bb4afe24384fab7d1e762
+  metadata.gz: 6ae4d6b7011a033487e95f47f3ee1e96d0219ff4
+  data.tar.gz: c2bf30d10e15d6628bd50400219eb9a9be4ad22b
 SHA512:
-  metadata.gz: ac5b1d00efe92c2a8139ac95d0cbf9875c6c223506ef838db977fccdc6091e972e02f2fac88bd0d6c724e319360893092bc321b00cfda5ed9981303d36fd3f38
-  data.tar.gz: 7d1dd84e234a0d02b6f83632aac032510b5028464bec99822a50a2ec66790b62ae3829257530d2a7ba8d4970ce29a7982d612887676d7c4af114e2919a681ccb
+  metadata.gz: cda000b1014f4c39fa205037399463588a4783715c89e09578c57a0bc57dba120d814bdc1cdfe0bb30aa277cd545a533f7a3cc86b67f3f1456d5268870614d33
+  data.tar.gz: 6ea7d7d6c5aad4a11db5ec486056cde3142207df44e9aa79db3c4081bd86a3f01c090d213123d9e9cc68ede69213c3233cad660bbbc2d6de7d283a1a894c75eb

data/.gitignore

@@ -27,9 +27,9 @@ build/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
+Gemfile.lock
+.ruby-version
+.ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc

data/.travis.yml

@@ -0,0 +1,5 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.3.0
+before_install: gem install bundler -v 1.12.5

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Dustin Morrill
+Copyright (c) 2015-2017 Dustin Morrill
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

data/README.md

@@ -1,6 +1,8 @@
 BrickAndMortar: A Solid Foundation for Software Projects
 ================================================
 
+[![Build Status](https://travis-ci.org/dmorrill10/brick_and_mortar.svg?branch=master)](https://travis-ci.org/dmorrill10/brick_and_mortar)
+
 What is BrickAndMortar?
 ---------------
 
@@ -16,7 +18,7 @@ It is not nearly as fancy a tool as *Bundler* or the like that does dependency c
 Supported Systems
 -----------------
 
-Currently only targeted for Linux, and only tested on Ubuntu.
+Currently only targeted for *nix. Tested on Ubuntu and Mac OS X.
 
 
 Requirements
@@ -30,7 +32,7 @@ Usage
 
 1. Install `brick_and_mortar` gem with `gem install brick_and_mortar`
 2. Write a `Brickfile` in your project's root directory that has the following fields:
-  
+
   `name`
   ~   The name of the dependency. The directory or link that will be present in the `vendor` directory will have this name.
 
@@ -38,7 +40,7 @@ Usage
   ~   The version of the brick as a string in whatever format is natural for it. This will be appended to the directory name of the copy of the brick downloaded in the `$BRICK_STORE_PREFIX/.brick_store` directory.
 
   `location`
-  ~   Location of the brick. Either local system path, version control repository (*Git*, *Mercurial*, and *Subversion* currently supported), or URL.
+  ~   Location of the brick. Either local system path, version control repository (*Git*, *Mercurial*, and *Subversion* currently supported), or URL. *zip*, *tar.gz*, and *tar.bz2* are the only currently supported compressed URL package formats.
 
 3. Run `mortar` to install bricks to `vendor`, downloading them if necessary to `$BRICK_STORE_PREFIX/.brick_store`.
 
@@ -54,8 +56,8 @@ Write a `$HOME/.brick_and_mortarrc` file to specify:
 ~   The directory that contains `.brick_store`. As the name suggests, `.brick_store` is where all bricks will be stored before they are linked or copied into the `vendor` directories of individual projects.
 
 `DEFAULT_BRICK_SHARING_POLICY`
-~   Specify the default behavior when placing bricks in projects. Accepts either 
-    - `copy`, where the brick will be copied into `vendor`, or 
+~   Specify the default behavior when placing bricks in projects. Accepts either
+    - `copy`, where the brick will be copied into `vendor`, or
     - `link`, where the brick will be symbolically linked into `vendor`.
     Defaults to `link`.
 
@@ -63,6 +65,6 @@ Write a `$HOME/.brick_and_mortarrc` file to specify:
 License
 -------
 
-Copyright Dustin Morrill, 2015
+Copyright Dustin Morrill, 2015-2017
 
 MIT License

data/brick_and_mortar.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'git'
   spec.add_dependency 'rubyzip'
+  spec.add_dependency 'bzip2-ffi'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'

data/lib/brick_and_mortar/brick.rb

@@ -11,13 +11,20 @@ module BrickAndMortar
       end
       attr_reader :method, :path, :format
 
-      FORMATS = {:plain => 'plain', :zip => 'zip', :tar_gz => 'tar.gz'}
+      FORMATS = {
+        :plain => 'plain',
+        :zip => 'zip',
+        :tar_gz => 'tar.gz',
+        :tar_bz2 => 'tar.bz2'
+      }
 
       def self.url_to_format(url)
-        if url.match(/\.zip$/)
+        if url.match(/\.#{FORMATS[:zip]}$/)
           FORMATS[:zip]
-        elsif url.match(/\.tar.gz$/)
+        elsif url.match(/\.#{FORMATS[:tar_gz]}$/)
           FORMATS[:tar_gz]
+        elsif url.match(/\.#{FORMATS[:tar_bz2]}$/)
+          FORMATS[:tar_bz2]
         else
           FORMATS[:plain]
         end
@@ -110,10 +117,10 @@ module BrickAndMortar
             end
             if @location.format == Location::FORMATS[:zip]
               Download.get_and_unpack_zip(@location.path, @destination)
-            elsif
-              if @location.format == Location::FORMATS[:tar_gz]
-                Download.get_and_unpack_tar_gz(@location.path, @destination)
-              end
+            elsif @location.format == Location::FORMATS[:tar_gz]
+              Download.get_and_unpack_tar_gz(@location.path, @destination)
+            elsif @location.format == Location::FORMATS[:tar_bz2]
+              Download.get_and_unpack_tar_bz2(@location.path, @destination)
             else
               raise UnrecognizedFormat.new(@location.format)
             end

data/lib/brick_and_mortar/download.rb

@@ -8,6 +8,7 @@ OpenURI::Buffer.const_set 'StringMax', 0
 require 'zip'
 require 'zlib'
 require 'rubygems/package'
+require 'bzip2/ffi'
 
 module BrickAndMortar
   module Download
@@ -37,9 +38,9 @@ module BrickAndMortar
     # Thanks to TomCZ
     # http://stackoverflow.com/questions/856891/unzip-zip-tar-tag-gz-files-with-ruby
     # for this
-    def self.deflate_tar_gz(tar_gz_archive, destination = Dir.pwd)
+    def self.deflate_tar(tar_string, destination = Dir.pwd)
       first_directory = nil
-      Gem::Package::TarReader.new(Zlib::GzipReader.open(tar_gz_archive)) do |tar|
+      Gem::Package::TarReader.new(tar_string) do |tar|
         dest = nil
         tar.each do |entry|
           if entry.full_name == TAR_LONGLINK
@@ -81,6 +82,21 @@ module BrickAndMortar
       end
       first_directory
     end
+    def self.deflate_tar_gz(tar_gz_archive, destination = Dir.pwd)
+      deflate_tar(Zlib::GzipReader.open(tar_gz_archive), destination)
+    end
+    def self.deflate_tar_bz2(archive, destination = Dir.pwd)
+      Bzip2::FFI::Reader.open(archive) do |reader|
+        File.open("#{destination}.tar", 'w') do |tar|
+          tar.write reader.read
+        end
+      end
+      first_directory = File.open("#{destination}.tar", 'r') do |tar|
+        deflate_tar(tar)
+      end
+      FileUtils.rm "#{destination}.tar"
+      first_directory
+    end
     def self.get_and_unpack_zip(url, name = nil, options = {})
       unless name
         name = name_from_path url
@@ -95,5 +111,12 @@ module BrickAndMortar
       uncompressed_dir_name = deflate_tar_gz(open(url))
       FileUtils.mv uncompressed_dir_name, name
     end
+    def self.get_and_unpack_tar_bz2(url, name = nil, options = {})
+      unless name
+        name = name_from_path url
+      end
+      uncompressed_dir_name = deflate_tar_bz2(open(url))
+      FileUtils.mv uncompressed_dir_name, name
+    end
   end
 end

data/lib/brick_and_mortar/version.rb

@@ -1,3 +1,3 @@
 module BrickAndMortar
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 end

data/spec/download_spec.rb

@@ -35,4 +35,24 @@ describe BrickAndMortar::Download do
       end
     end
   end
+
+  describe 'given tar.bz2 url brick configuration' do
+    tar_bz2_url_brick_configruation = MockBrickConfiguration.new(
+      'mock_brick',
+      '0.0.1',
+      MockBrickLocation.new('download', 'http://www.computerpokercompetition.org/downloads/code/competition_server/project_acpc_server_v1.0.41.tar.bz2')
+    )
+
+    it 'downloads the brick' do
+      Dir.mktmpdir do |dir|
+        Dir.chdir dir do |d|
+          BrickAndMortar::Download.get_and_unpack_tar_bz2(
+            tar_bz2_url_brick_configruation.location.url,
+            tar_bz2_url_brick_configruation.destination
+          )
+          File.directory?(File.join(dir, tar_bz2_url_brick_configruation.destination)).must_equal true
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick_and_mortar
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Dustin Morrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2017-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bzip2-ffi
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +118,7 @@ extra_rdoc_files: []
 files:
 - ".gitattributes"
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -188,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: 'BrickAndMortar: A Solid Foundation for Software Projects'
@@ -210,4 +225,3 @@ test_files:
 - spec/support/test_files/test_project/Brickfile
 - spec/support/test_files/url_brickfile.yml
 - spec/svn_spec.rb
-has_rdoc: