unbound 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cc064fa99fcaf867d9474ede41d93ad258742e4
-  data.tar.gz: dd0dd181466af047705bb39f94db521141eaa752
+  metadata.gz: 211b56bb13a5da0ea3a1b0421fe41f6411db3f28
+  data.tar.gz: 29166b0876346b3594e526ad2b73334617691ac0
 SHA512:
-  metadata.gz: 51c16931c919a0635208f7ec37f4820f5a7b53e9ec7de05d34f8f0c52d0496dd3e2be8684bf7ac3fedf0cb91565d8c9a14076885b789efd91eda13efbb708f81
-  data.tar.gz: b24c0751df53c3e44418db0c85de1b8678c9bd0f0a6180511316ba88adcf39bb17c499a458927661a38b6d5545b8fd9cc0bee76249a37ce59fdbdadbec9e67f1
+  metadata.gz: 4bfe6de68443b48c64989b827f010a348d5d02058013aacabb3190c03b212301bce6b859311d935d2258869a4c71db25e32375ba48f62c1cf057431fd9f9579b
+  data.tar.gz: 14b676d3ba013c16914494abe81b46c21341de3420a34e84801e869926dcc0d532a535971aa24d628f9f11fe3a3d50dcbd50797437b1d5e8818f8bc5edcac1a1

data/CHANGELOG.md

@@ -0,0 +1,26 @@
+Next
+====
+
+* Your contribution here.
+
+2.1.0 (2014-07-23)
+==================
+
+* Make :spec default rake task - [@justfalter](https://github.com/justfalter) 
+* Add CONTRIBUTING.md - [@justfalter](https://github.com/justfalter) 
+* Rename Changes -> CHANGELOG.md - [@justfalter](https://github.com/justfalter) 
+* [#2](https://github.com/justfalter/unbound-ruby/pull/2): Add helper for synchronous queries - [@corny](https://github.com/corny)
+
+2.0.0 (2014-03-12)
+==================
+* Breaking change: Unbound::Query#cancel! no longer cancels the query. Instead, use Unbound::Resolver#cancel_query to cancel queries. - [@justfalter](https://github.com/justfalter) 
+* Unbound::Query#async_id will now be set to nil when the query has finished. - [@justfalter](https://github.com/justfalter) 
+* Disable autoclose on the return of Context#io object. autoclose is bad news. - [@justfalter](https://github.com/justfalter) 
+
+1.0.1 (2014-03-06)
+==================
+* Fix issue where the resolver couldn't keep track of in-flight queries on 32-bit systems. - [@justfalter](https://github.com/justfalter) 
+
+1.0.0 (2014-01-31)
+==================
+* Initial release. - [@justfalter](https://github.com/justfalter) 

data/CONTRIBUTING.md

@@ -0,0 +1,116 @@
+Contributing to Unbound-Ruby
+============================
+
+You're encouraged to submit [pull requests](https://github.com/justfalter/unbound-ruby/pulls), [propose features and discuss issues](https://github.com/justfalter/unbound-ruby/issues).
+
+#### Fork the Project
+
+Fork the [project on Github](https://github.com/justfalter/unbound-ruby) and check out your copy.
+
+```
+git clone https://github.com/contributor/unbound-ruby.git
+cd unbound-ruby
+git remote add upstream https://github.com/justfalter/unbount-ruby.git
+```
+
+#### Create a Topic Branch
+
+Make sure your fork is up-to-date and create a topic branch for your feature or bug fix.
+
+```
+git checkout master
+git pull upstream master
+git checkout -b my-feature-branch
+```
+
+#### Bundle Install and Test
+
+Ensure that you can build the project and run tests.
+
+```
+bundle install
+bundle exec rake
+```
+
+#### Write Tests
+
+Try to write a test that reproduces the problem you're trying to fix or describes a feature that you want to build. Add to [spec/](spec/).
+
+We definitely appreciate pull requests that highlight or reproduce a problem, even without a fix.
+
+#### Write Code
+
+Implement your feature or bug fix.
+
+Make sure that `bundle exec rake` completes without errors.
+
+#### Write Documentation
+
+Document any external behavior in the [README](README.md).
+
+#### Update Changelog
+
+Add a line to [CHANGELOG](CHANGELOG.md) under *Next Release*. Make it look like every other line, including your name and link to your Github account.
+
+#### Commit Changes
+
+Make sure git knows your name and email address:
+
+```
+git config --global user.name "Your Name"
+git config --global user.email "contributor@example.com"
+```
+
+Writing good commit logs is important. A commit log should describe what changed and why.
+
+```
+git add ...
+git commit
+```
+
+#### Push
+
+```
+git push origin my-feature-branch
+```
+
+#### Make a Pull Request
+
+Go to https://github.com/contributor/unbound-ruby and select your feature branch. Click the 'Pull Request' button and fill out the form. Pull requests are usually reviewed within a few days.
+
+#### Rebase
+
+If you've been working on a change for a while, rebase with upstream/master.
+
+```
+git fetch upstream
+git rebase upstream/master
+git push origin my-feature-branch -f
+```
+
+#### Update CHANGELOG Again
+
+Update the [CHANGELOG](CHANGELOG.md) with the pull request number. A typical entry looks as follows.
+
+```
+* [#123](https://github.com/justfalter/unbound-ruby/pull/123): Reticulated splines - [@contributor](https://github.com/contributor).
+```
+
+Amend your previous commit and force push the changes.
+
+```
+git commit --amend
+git push origin my-feature-branch -f
+```
+
+#### Check on Your Pull Request
+
+Go back to your pull request after a few minutes and see whether it passed muster with Travis-CI. Everything should look green, otherwise fix issues and amend your commit as described above.
+
+#### Be Patient
+
+It's likely that your change will not be merged and that the nitpicky maintainers will ask you to do more, or fix seemingly benign problems. Hang on there!
+
+#### Thank You
+
+Please do know that we really appreciate and value your time and work. We love you, really.

data/Gemfile

@@ -8,7 +8,8 @@ group :development do
 end
 
 group :test do
-  gem "rspec"
+  gem "rspec", "~> 3.0"
+  gem "rspec-its"
   gem "simplecov"
   gem "rake"
 end

data/Rakefile

@@ -26,7 +26,7 @@ else
       Dir.glob("examples/*") + 
       Dir.glob("spec/{*.rb}") + 
       Dir.glob("spec/conf/{*.conf}") + 
-      %w(LICENSE.txt Gemfile README.md Rakefile VERSION)
+      %w(CONTRIBUTING.md CHANGELOG.md LICENSE.txt Gemfile README.md Rakefile VERSION)
 
   end
   Jeweler::RubygemsDotOrgTasks.new
@@ -41,3 +41,5 @@ else
     spec.pattern = FileList['spec/**/*_spec.rb']
   end
 end
+
+task :default => [:spec]

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

data/lib/unbound/context.rb

@@ -87,6 +87,20 @@ module Unbound
       Unbound::Bindings.ub_fd(@ub_ctx)
     end
 
+    def resolve(name, rrtype=1, rrclass=1)
+      check_closed!
+      result_ptr = FFI::MemoryPointer.new :pointer
+      raise_if_error!(
+        Unbound::Bindings.ub_resolve(
+          @ub_ctx, name, rrtype, rrclass, result_ptr))
+      ptr = result_ptr.get_pointer(0)
+      begin
+        Unbound::Result.new(ptr).to_resolv
+      ensure
+        Unbound::Bindings.ub_resolve_free ptr
+      end
+    end
+
     def resolve_async(name, rrtype, rrclass, callback, private_data = nil)
       check_closed!
       async_id_ptr = FFI::MemoryPointer.new :int

data/spec/context_spec.rb

@@ -10,25 +10,25 @@ describe Unbound::Context do
   end
 
   subject { @ctx }
-  its(:raise_on_noid?) { should be_false }
+  its(:raise_on_noid?) { should eq false }
 
 
   it "should let me indicate that it should raise an error if the error code is :noid" do
     @ctx.raise_on_noid = true
-    expect(@ctx.raise_on_noid?).to be_true
+    expect(@ctx.raise_on_noid?).to eq true
   end
 
   describe "#closed?" do
     it "should indicate whether the context is closed or not" do
-      expect(@ctx.closed?).to be_false
+      expect(@ctx.closed?).to eq false
       @ctx.close
-      expect(@ctx.closed?).to be_true
+      expect(@ctx.closed?).to eq true
     end
   end
 
   describe "#close" do
     it "should delete the underlying context" do
-      Unbound::Bindings.should_receive(:ub_ctx_delete)
+      expect(Unbound::Bindings).to receive(:ub_ctx_delete)
       @ctx.close
     end
 
@@ -70,6 +70,24 @@ describe Unbound::Context do
     end
   end
 
+
+  context "an synchronous name resolution method" do
+    # expects:
+    #   @ctx 
+    describe 'existing zone' do
+      before :each do
+        @ctx.load_config(UnboundHelper.config_file("local_zone.conf"))
+      end
+      subject{ @ctx.resolve("mycomputer.local", 1, 1) }
+      it "should have the proper answer" do
+        expect(subject.answer.length).to be(1)
+        answer = subject.answer[0]
+        expect(answer[0].to_s).to eq("mycomputer.local")
+        expect(answer[2].address.to_s).to eq("192.0.2.51")
+      end
+    end
+  end
+
   shared_examples_for "an asynchronous name resolution method" do
     # expects:
     #   @processing_proc = A Proc
@@ -126,14 +144,14 @@ describe Unbound::Context do
       
       it "should raise an APIError when canceling a non-existent query" do
         @ctx.raise_on_noid = true 
-        expect(@ctx.raise_on_noid?).to be_true
+        expect(@ctx.raise_on_noid?).to eq true
         expect(lambda do 
           @ctx.cancel_async_query(@async_id + 1)
         end).to raise_error(Unbound::APIError)
       end
 
       it "#raise_on_noid=false should raise an APIError when canceling a non-existent query" do
-        expect(@ctx.raise_on_noid?).to be_false
+        expect(@ctx.raise_on_noid?).to eq false
         expect(@ctx.cancel_async_query(@async_id + 1)).to eq(:noid)
       end
     end
@@ -149,7 +167,7 @@ describe Unbound::Context do
     end
 
     it "should not be set to autoclose" do
-      expect(@ctx.io.autoclose?).to be_false
+      expect(@ctx.io.autoclose?).to eq false
     end
 
     it "should not autoclose when garbage collection occurs" do

data/spec/query_spec.rb

@@ -16,20 +16,20 @@ describe Unbound::Query do
 
     describe "#finished?" do
       it "should be false by default" do
-        expect(@query.finished?).to be_false
+        expect(@query.finished?).to eq false
       end
       it "should be true after #cancel! is called" do
         @query.cancel!
-        expect(@query.finished?).to be_true
+        expect(@query.finished?).to eq true
       end
       it "should be true after #error! is called" do
         @query.error!(1234)
-        expect(@query.finished?).to be_true
+        expect(@query.finished?).to eq true
       end
       it "should be true after #answer! is called" do
         result = double("Result")
         @query.answer!(result)
-        expect(@query.finished?).to be_true
+        expect(@query.finished?).to eq true
       end
     end
 
@@ -64,11 +64,11 @@ describe Unbound::Query do
 
     describe "#started?" do
       it "should be false by default" do
-        expect(@query.started?).to be_false
+        expect(@query.started?).to eq false
       end
       it "should be true after start! is called" do
         @query.start!(1234)
-        expect(@query.started?).to be_true
+        expect(@query.started?).to eq true
       end
     end
 

data/spec/resolver_spec.rb

@@ -78,33 +78,33 @@ describe Unbound::Resolver do
 
   describe "#outstanding_queries?" do
     it "should be false if there are no outstanding queries"  do
-      expect(@resolver.outstanding_queries?).to be_false
+      expect(@resolver.outstanding_queries?).to eq false
     end
 
     it "should be true if there are any outstanding queries"  do
       @resolver.send_query(query)
-      expect(@resolver.outstanding_queries?).to be_true
+      expect(@resolver.outstanding_queries?).to eq true
     end
   end
 
   describe "#closed?" do
     it "should not be closed by default"  do
-      expect(@resolver.closed?).to be_false
+      expect(@resolver.closed?).to eq false
     end
     it "should be closed after calling #close" do
       @resolver.close
-      expect(@resolver.closed?).to be_true
+      expect(@resolver.closed?).to eq true
     end
   end
 
   describe "#close" do
     it "should call #cancel_all" do
-      @resolver.should_receive(:cancel_all).and_call_original
+      expect(@resolver).to receive(:cancel_all).and_call_original
       @resolver.close
     end
 
     it "should close the context" do
-      @context.should_receive(:close).and_call_original
+      expect(@resolver).to receive(:close).and_call_original
       @resolver.close
     end
   end

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup :default, :test
 
+require 'rspec/its'
+
 module UnboundHelper
   require 'pathname'
   SPEC_ROOT = Pathname.new(__FILE__).dirname.expand_path

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: unbound
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Mike Ryan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: 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: jeweler
   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'
 description: Unbound DNS resolver bindings for Ruby
@@ -46,6 +46,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
+- CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -81,17 +83,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Unbound DNS resolver bindings for Ruby