rbtelldus 0.0.9.pre.beta → 0.0.10.beta

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Njk3Y2U3MWEwM2VmMmVjMmUzYzBmOTc1NWUwMGFmNGI5NmQ3ZTMwMg==
+    NjMwNGJmOTJlMDRkMmVmZTg5M2M4MzczOGM1Y2NjMWE0ZDBjMGRhMg==
   data.tar.gz: !binary |-
-    MWY3NDgwZGQ3MzM0MzA5ZTg5YTQyNWE1NWRmNGYxMmJhNjljOTEyMQ==
+    ZDk1NGE1N2ZlOWYyODg5OWY2ODU4Mjc3MzA0OWQzY2NlYzYwZDMxMQ==
 SHA512:
   metadata.gz: !binary |-
-    NzIzYmY1ZDIxNjNhMTkyMTFlOWNjZDY5ZWE2ZWQ0Zjg5YmNkMDc2YWI1Mjdj
-    ODMzZDE5NzQ3ODIwNjQyNTQzMGY2YTQ2YmZmYzNjZGQwYmQyNDE0MzJlZGI2
-    YjRiYzU0NWJjMTllMjNlNjJmNWZhYTliNDJjZGIyOGNkY2I2YTU=
+    M2U0ZjNjNzg3OWZlNDYyOTk3ZjNkMTZkNTc4OTkxZWE0NDAwZmRmNWU2OWQy
+    Y2U5ODY3NzAyZjJlNjMzMTY1ZjM5ZmY3YTMzMDczNGVkNjNjNmY0NzZmNTcx
+    MGM1OWU5NTk1YmEwNDI1YzY5YzAyODBlOGMzMjViNzJjYjk3MjM=
   data.tar.gz: !binary |-
-    MmYzYzBhNGU1ZmZlZjdhOWY5OTdkYzEwYjE0MzRjZTUyNDViMjNjNzY5ZGZh
-    ZDY0ZWQ5MmRmODU5YTNlOTZiZjY3YjM3MWVhYzU4NDMyZTA2MDQ1OTMzMDA1
-    NzQwMjIwZTQ4YTk1OTFhNjA5NDM5NDlmN2U3ZmQyNTJhNWE3ZjE=
+    Y2YyMTBhYzJlZTEzNzcxZTRhNWJmY2Q0NTMxYTNkNTQ3NGM4N2UwMGU3YTY1
+    YWRjZTc4M2NjMjJlNGY2OWIzN2U1MGY4ZmVkYTEzZGE5YmY1YjNhMjg5NWY0
+    ZDlhMzVkYjVkNTRiYjBhNmRiZWIxNzc1MTcwYTFmYTlmZTRkNDE=

data/.travis.yml

@@ -1,16 +1,25 @@
 language: ruby
 rvm:
-- 1.9.3
-- '2.1'
-- '2.2'
+  - 1.9.3
+  - '2.1'
+  - '2.2'
 script: bundle exec rake test
 before_deploy:
-- bundle exec rake build
-- export GEM_FILE="$(ls -1 pkg/*.gem | tail -n1)"
+  - bundle exec rake gem:build
+  - export GEM_FILE="$(ls -1 pkg/*.gem | tail -n1)"
 deploy:
-  provider: rubygems
-  api_key: $RUBYGEMS_KEY
-  gem: rbtelldus
-  on:
-    tags: true
-    repo: kaffepanna/rtelldus
+  - provider: rubygems
+    api_key: $RUBYGEMS_KEY
+    gem: rbtelldus
+    on:
+      tags: true
+      repo: kaffepanna/rbtelldus
+  - provider: github
+    api_key:
+      secure: jSaaNShiVf96bnJw+bHICxx+DBy5c5P8O/QYlFHgEltJPRQX1WlbFmipduwuVjyiOTnnBeSghRsujVef5Ld9ZeKMSB7jOgDpfPAqEBIxsWYf8SgxSHuwhGjAtsBn8WGbEcE1GQd4H4hsoEEi43ObkFgzuVv7lSSU9TyxX+5Rcf4or5doYWlQzsQxEfd2Lp5ATHDhxkafnpcCLSIsYyc5q8nBjnavelHPewC2gLzBkQYVE1HQxuABSb7jOMYKq0AGjOiKFmDck7cb8+eZwi4RjwjOStfdHm0rKM98/ZIdXJ0VgnaEny2q1J1shc2VqTPEC0ssZpE5kmFAHcFP74voj0ww7i3qH6BNJfJr4Sf4S3UPtAATRVavJbMjQvGjHs68Mb13RNbCQbdSSDg+88UhVTAowuwhAb3nPu5/IGuD4B1hGhSqmfdVBjhdWotqQIlEteaBIC+/IheSH+4f7CPhCIyb+GapVr81H1Hz+RlD9KMmExG7SffLeGSUtGHplAawBnGt9fCF7FTvN9ZfJdIW60ld669EFNlAmmaahyoaBgBn32XTx/UJc5ntweloAIQruuMrBP7zOvQJLJVMtrnJI65t47Zm6hq9e2yXt+Hl9MzslzELhPmE8J9/JrtlvzAg5dC9PxRMGfILCuf+hjMO+5Ag1Vb6h+VcixnjIm+lgFI=
+    file: ${GEM_FILE}
+    file_glob: true
+    on:
+      tags: true
+      repo: kaffepanna/rbtelldus
+

data/Rakefile

@@ -1,21 +1,6 @@
-require "rake/extensiontask"
-require 'bundler/gem_tasks'
-
-Rake::ExtensionTask.new('telldus') do |ext|
-  ext.name = 'telldus'                # indicate the name of the extension.
-  ext.ext_dir = 'lib/telldus/ext/'         # search for 'hello_world' inside it.
-  ext.lib_dir = 'lib/telldus/ext/'              # put binaries into this folder.
-  ext.tmp_dir = 'tmp'                     # temporary folder used during compilation.
-  #ext.source_pattern = "*.{c,cpp}"        # monitor file changes to allow simple rebuild.
-  #ext.config_options << '--with-foo'      # supply additional options to configure script.
-  #ext.gem_spec = spec                     # optionally indicate which gem specification                                          # will be used.
-end
-
-Rake::ExtensionTask.new('telldus_state') do |ext|
-  ext.name = 'telldus_state'
-  ext.ext_dir = 'spec/mocks/telldus-mock'
-  ext.lib_dir = 'spec/mocks/telldus-mock/lib'
 
+namespace 'gem' do
+  require 'bundler/gem_tasks'
 end
 
 def run cmd
@@ -23,33 +8,37 @@ def run cmd
   raise output unless $? == 0
 end
 
-task :telldus_core_mock do
-  Dir.chdir('spec/mocks/telldus-mock') do
-    run "ruby extconf.rb > /dev/null"
-    run "make"
-    symlink "../telldus_state.so", "./lib/telldus_state.so", {force: true}
-    symlink "../telldus_state.so", "./lib/libtelldus-core.so", {force: true}
-    ENV['LD_LIBRARY_PATH']="spec/mocks/telldus-mock/lib:#{ENV['LD_LIBRARY_PATH']}"
+namespace :compile do
+  desc 'build telldus-core mock'
+  task 'telldus_core' do
+    Dir.chdir('spec/mocks/telldus-mock') do
+      run "ruby extconf.rb > /dev/null"
+      run "make"
+      symlink "../telldus_state.so", "./lib/telldus_state.so", {force: true}
+      symlink "../telldus_state.so", "./lib/libtelldus-core.so", {force: true}
+      ENV['LD_LIBRARY_PATH']="spec/mocks/telldus-mock/lib:#{ENV['LD_LIBRARY_PATH']}"
+    end
   end
-end
 
-task :telldus_test_build => :telldus_core_mock do
-  Dir.chdir('lib/telldus/ext/') do
-    run "ruby extconf.rb --with-telldus-dir=../../../spec/mocks/telldus-mock"
-    run "make"
+  desc 'build rtelldus for testing'
+  task 'telldus:test' => 'telldus_core' do
+    Dir.chdir('ext/telldus') do
+      run "ruby extconf.rb --with-telldus-dir=../../spec/mocks/telldus-mock"
+      run "make"
+    end
   end
-end
 
-task :telldus_build do
-  Dir.chdir('lib/telldus/ext') do
-    run "ruby extconf.rb"
-    run "make"
+  desc 'build telldus'
+  task :telldus do
+    Dir.chdir('lib/telldus/ext') do
+      run "ruby extconf.rb"
+      run "make"
+    end
   end
 end
-task :test => [:telldus_test_build] do
+
+desc 'run tests'
+task :test => [:'compile:telldus:test'] do
   sh "rspec -f d"
 end
 
-#Rake::Task['bundle:build'].prerequisites << Rake::Task['telldus_test_build']
-
-

data/{lib/telldus/ext → ext/telldus}/extconf.rb

@@ -2,7 +2,7 @@
 require 'mkmf'
 
 # Give it a name
-extension_name = 'telldus'
+extension_name = 'rbtelldus/rbtelldus'
 
 dir_config("telldus")
 

data/{lib/telldus/ext/telldus.c → ext/telldus/rbtelldus.c}

@@ -118,7 +118,7 @@ static VALUE telldus_set_model(VALUE self, VALUE id, VALUE name)
 	return Qfalse;
 }
 
-void Init_telldus(void)
+void Init_rbtelldus(void)
 {
 	rb_mTelldus = rb_define_module("Telldus");
 	rb_define_singleton_method(rb_mTelldus, "on", telldus_on, 1);

data/lib/rbtelldus.rb

@@ -0,0 +1 @@
+require 'telldus/rbtelldus.so'

data/rbtelldus.gemspec

@@ -4,13 +4,13 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rbtelldus"
-  spec.version       = `git tag | tail -1`
+  spec.version       = `git describe --abbrev=0 --tags`
   spec.authors       = ["Patrik Pettersson"]
   spec.email         = ["pettersson.pa@gmail.com"]
 
   spec.summary       = %q{Small wrapper for telldus-core library. }
   spec.description   = %q{Write a longer description or delete this line.}
-  spec.homepage      = "https://github.com/kaffepanna/rtelldus"
+  spec.homepage      = "https://github.com/kaffepanna/rbtelldus"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -18,12 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.extensions = ["lib/telldus/ext/extconf.rb"]
+  spec.extensions = ["ext/telldus/extconf.rb"]
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rack-test"
-  spec.add_development_dependency 'rake-compiler', '~> 0.8.3'
-
-  spec.add_runtime_dependency 'sinatra'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbtelldus
 version: !ruby/object:Gem::Version
-  version: 0.0.9.pre.beta
+  version: 0.0.10.beta
 platform: ruby
 authors:
 - Patrik Pettersson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,54 +52,12 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.3
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  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'
 description: Write a longer description or delete this line.
 email:
 - pettersson.pa@gmail.com
 executables: []
 extensions:
-- lib/telldus/ext/extconf.rb
+- ext/telldus/extconf.rb
 extra_rdoc_files: []
 files:
 - .gitignore
@@ -108,14 +66,13 @@ files:
 - Gemfile
 - LICENSE.txt
 - Rakefile
-- api.rb
-- lib/telldus.rb
-- lib/telldus/ext/.gitignore
-- lib/telldus/ext/extconf.rb
-- lib/telldus/ext/telldus.c
-- lib/telldus/telldus.rb
+- ext/telldus/.gitignore
+- ext/telldus/extconf.rb
+- ext/telldus/rbtelldus.c
+- lib/rbtelldus.rb
+- lib/rbtelldus/.gitkeep
 - rbtelldus.gemspec
-homepage: https://github.com/kaffepanna/rtelldus
+homepage: https://github.com/kaffepanna/rbtelldus
 licenses:
 - MIT
 metadata: {}

data/api.rb

@@ -1,9 +0,0 @@
-require_relative 'lib/telldus.rb'
-require 'sinatra/base'
-
-module Telldus
-  class Api < Sinatra::Base
-    get '/devices' do
-    end
-  end
-end

data/lib/telldus/telldus.rb

@@ -1,4 +0,0 @@
-require_relative 'ext/telldus'
-module Telldus
-end
-

data/lib/telldus.rb

@@ -1 +0,0 @@
-require_relative 'telldus/telldus.rb'