redsnow 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 813bf0b33e071a2e28d722cdda30c3e38ba9ff64
-  data.tar.gz: a8db68894fdcac94a2e1d18eaa7d4f6d4a612287
+  metadata.gz: 471d343f32c079a7420b9cc9df8377700bd15628
+  data.tar.gz: a61fbc9b75a3a19ffae82cbb93e7f1573c23ba3b
 SHA512:
-  metadata.gz: 4d6d46dbb8704bf206ee1e27c404bed7a270eee2844cd2755d9c93c4447cf957b88c593f22b181c16bab96009896baa99949725a3966668ef220dc93e891729f
-  data.tar.gz: 38ed17f995f93b77c509660adc81262d47405806edb6cd64a8a28c69380e20e7ead8d5c6affbf66b6109126ea43ed6b44c70b72f810a272141cd5b1470bb0fc6
+  metadata.gz: add98cc11868851a984d68c173c0659d0f800ffecfc546c1ef2e9179998c90845a32f5efae4b829381e50daa784e8bc69087b00b29f737b69f5b0590a87b33b6
+  data.tar.gz: 7fc7d2a681eef08c8655cd9bf489e77ca1b0fbaea4d5449287fd6d5acfa257fd9b29d99963cb8182f926e14675ded8f6b000c9526bc33537d038d266ddd48e3f

data/.travis.yml

@@ -9,6 +9,7 @@ before_install:
 - git submodule update --init --recursive
 - gem update bundler
 - bundle
+env: RECOMPILE=true
 notifications:
   email:
     recipients:

data/CHANGELOG.md

@@ -1,5 +1,6 @@
 # Changelog
-
+- 0.1.6
+    - Fixing problem with submodules in Gem install [IS#25](https://github.com/apiaryio/redsnow/issues/25)
 - 0.1.5
     - Ensure submodules are initialised before building [PR#22](https://github.\
     - com/apiaryio/redsnow/pull/22)

data/Rakefile

@@ -4,8 +4,23 @@ rescue LoadError
   puts "Cannot load bundler/gem_tasks"
 end
 
-require 'rake/testtask'
-require 'ffi'
+begin
+  require 'rake/testtask'
+rescue LoadError
+  puts "Cannot load rake/testtask"
+end
+
+begin
+  require 'ffi'
+rescue LoadError
+  puts "Cannot load ffi"
+end
+
+begin
+  require 'yard'
+rescue LoadError
+  puts "Cannot load yard"
+end
 
 task :default => :compile
 
@@ -15,19 +30,29 @@ task :compile do
   if FFI::Platform.mac?
     prefix = ""
   end
+  # Path to compiled snowcrash library
   path = File.expand_path("ext/snowcrash/build/out/Release/#{prefix}libsnowcrash.#{FFI::Platform::LIBSUFFIX}", File.dirname(__FILE__))
-  puts path
+  puts "Path to library #{path}"
   if !File.exists?(path) || ENV['RECOMPILE']
-    puts "Initializing submodules (if required)..."
-    `git submodule update --init --recursive 2>/dev/null`
+    unless File.directory?(File.expand_path("ext/snowcrash/src"))
+      puts "Initializing submodules (if required)..."
+      `git submodule update --init --recursive 2>/dev/null`
+    end
     puts "Compiling extension..."
     `cd #{File.expand_path("ext/snowcrash/")} && ./configure --shared && make`
-    exit $?.exitstatus
+    status = $?.exitstatus
+    if status == 0
+      puts "Compiling done."
+    else
+      puts "Compiling error, exiting."
+      next # If i'm using exit, abort I have some errors in rake install but gem can be installed
+    end
   else
     puts "Extension already compiled. To recompile set env variable RECOMPILE=true."
   end
 end
 
+desc "Run tests"
 Rake::TestTask.new(:test) do |test|
   Rake::Task["compile"].invoke
 
@@ -38,7 +63,6 @@ end
 
 # ----- Documentation tasks ---------------------------------------------------
 
-require 'yard'
 YARD::Rake::YardocTask.new(:doc) do |t|
   t.options = %w| --embed-mixins --markup=markdown |
 end

data/Vagrantfile

@@ -1,17 +1,16 @@
 Vagrant.configure("2") do |config|
-  config.vm.box = "precise64"
-  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+  config.vm.box = "ffuenf/ubuntu-14.04-server-amd64"
 
   # VirtualBox
   config.vm.provider :virtualbox do |vb|
     vb.customize ["modifyvm", :id, "--memory", "2048"]
-    vb.customize ["modifyvm", :id, "--cpus", "1"]  
+    vb.customize ["modifyvm", :id, "--cpus", "1"]
   end
 
   # VMWare Fusion
   config.vm.provider :vmware_fusion do |vb|
     vb.vmx["memsize"] = "4096"
-    vb.vmx["numvcpus"] = "1" 
+    vb.vmx["numvcpus"] = "1"
   end
 
   config.vm.network :private_network, ip: "10.3.3.3"

data/lib/redsnow/version.rb

@@ -1,4 +1,4 @@
 module RedSnow
   # Gem version
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/provisioning.sh

@@ -3,13 +3,8 @@
 # GCC 4.7
 sudo apt-get update -y
 sudo apt-get install -y python-software-properties
-sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
 sudo apt-get update -y
-sudo apt-get install -y gcc-4.7 g++-4.7 gdb build-essential git-core curl mc vim
-sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.6 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.6
-sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 70 --slave /usr/bin/g++ g++ /usr/bin/g++-4.7
-
-#sudo update-alternatives --config gcc
+sudo apt-get install -y build-essential git-core curl mc vim
 
 # Ruby
 gem install bundler

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redsnow
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Ladislav Prskavec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi