Skip to content

Commit

Permalink
Revert to c3ae107
Browse files Browse the repository at this point in the history
  • Loading branch information
Luke Bayas committed Mar 26, 2013
1 parent 2ba966f commit a271336
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 151 deletions.
11 changes: 4 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
language: ruby

rvm:
- 2.0.0
- 1.9.3
- 1.9.2
- 1.8.7

env:
- NUODB_ROOT=/opt/nuodb
- RUBY_ROOT=/

notifications:
recipients:
- [email protected]
- [email protected]

before_script:
- make install
- wget http://www.nuodb.com/latest/nuodb-1.0-GA.linux.x86_64.deb --output-document=/var/tmp/nuodb.deb
- sudo dpkg -i /var/tmp/nuodb.deb

script:
- make all
- NUODB_ROOT=/opt/nuodb bundle exec rake test install

after_script:
- make uninstall
- sudo dpkg -r nuodb
55 changes: 0 additions & 55 deletions Gemfile.lock

This file was deleted.

1 change: 1 addition & 0 deletions History.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
=== 1.0.0

First release of the NuoDB API gem.

55 changes: 0 additions & 55 deletions Makefile

This file was deleted.

2 changes: 1 addition & 1 deletion Manifest.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
COPYING
History.txt
Manifest.txt
README.rdoc
README.md
Rakefile
ext/nuodb/extconf.rb
ext/nuodb/nuodb.cpp
Expand Down
18 changes: 0 additions & 18 deletions README.md

This file was deleted.

10 changes: 5 additions & 5 deletions README.rdoc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
## NuoDB - Ruby
= NuoDB/Ruby Interface

[![Build Status](https://api.travis-ci.org/nuodb/ruby-nuodb.png?branch=master)](https://api.travis-ci.org/nuodb/ruby-nuodb.png?branch=master)

This module builds a native C++ binding to let you easily integrate your [Ruby](http://www.ruby-lang.org/en/) web applications with [NuoDB](http://www.nuodb.com).
{<img src="https://api.travis-ci.org/nuodb/ruby-nuodb.png?branch=master" alt="Build Status" />}[http://travis-ci.org/nuodb/ruby-nuodb]
{<img src="https://gemnasium.com/nuodb/ruby-nuodb.png?travis" alt="Dependency Status" />}[https://gemnasium.com/nuodb/ruby-nuodb]
{<img src="https://codeclimate.com/badge.png" alt="Code Climate" />}[https://codeclimate.com/github/nuodb/ruby-nuodb]

== DESCRIPTION

Expand Down Expand Up @@ -77,4 +77,4 @@ To inspec the symbols on Mac:

otool -l ext/nuodb/nuodb.bundle

== REFERENCES
== REFERENCES
7 changes: 3 additions & 4 deletions ext/nuodb/nuodb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
#include <time.h>
#include <stdio.h>
#include <typeinfo>
#include <stdarg.h>

#define HAVE_CXA_DEMANGLE

Expand Down Expand Up @@ -177,7 +176,7 @@ static void print_address(char const * context, void * address)
if (DEBUG >= logLevel)
{
#if defined(__APPLE__)
//printf("%s: %016" PRIxPTR "\n", context, (uintptr_t) address);
printf("%s: %016" PRIxPTR "\n", context, (uintptr_t) address);
#endif
}
}
Expand Down Expand Up @@ -372,9 +371,9 @@ static void track_ref_count(char const * context, nuodb_handle * handle)
{
#if defined(__APPLE__)
nuodb_handle * parent = handle->parent_handle;
/*printf("[REFERENCE COUNT][%s] (%s @ %016" PRIxPTR "): %d (%s @ %016" PRIxPTR "): %d\n",
printf("[REFERENCE COUNT][%s] (%s @ %016" PRIxPTR "): %d (%s @ %016" PRIxPTR "): %d\n",
context, demangle(typeid(*handle).name()), (uintptr_t) handle,
handle->atomic, demangle(typeid(*parent).name()), (uintptr_t) parent, parent_count);*/
handle->atomic, demangle(typeid(*parent).name()), (uintptr_t) parent, parent_count);
#endif
}
}
Expand Down
3 changes: 2 additions & 1 deletion install-nuodb.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/sh -e

wget http://www.nuodb.com/latest/nuodb-1.0-GA.linux.x86_64.deb --output-document=/var/tmp/nuodb.deb
sudo dpkg -i /var/tmp/nuodb.deb
sudo dpkg -i /var/tmp/nuodb.deb

10 changes: 5 additions & 5 deletions tasks/rspec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'rubygems'
require 'rake'

GEM_ROOT = File.expand_path(File.join(File.dirname(__FILE__), ".."))
GEM_ROOT ||= File.expand_path(File.join(File.dirname(__FILE__), ".."))

begin

Expand Down Expand Up @@ -30,10 +30,10 @@
namespace :spec do
desc "Run all specs in spec directory with RCov"
RSpec::Core::RakeTask.new(:cov) do |t|
#require 'simplecov'
#SimpleCov.start do
# add_group 'Libraries', 'lib'
#end
require 'simplecov'
SimpleCov.start do
add_group 'Libraries', 'lib'
end
end

desc "Print Specdoc for all specs"
Expand Down

0 comments on commit a271336

Please sign in to comment.