dslimple 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbf7f4149dcbade896ca6a2e726c8a37fbd544db
-  data.tar.gz: 972fd40427086e75455b684a1db193df36fe2870
+  metadata.gz: dce8b719b5649f05c0aeb1797495cbba95c8498c
+  data.tar.gz: a3109feace113af1c23069889437e116d9684832
 SHA512:
-  metadata.gz: c13675d9aa205ddd94370d156146930cfa0ed9e8d93008397936c25f7660d557ddf4e91e662868c82d4530943ba7f68565edc63494f46f61bde694bbf2eba0dd
-  data.tar.gz: c0ddde8ee688d609710d89d7d11e38a211203bac8ba76e29a34e4a91c5d6c5b6b2f129530e9c30036c6807793ef7925dc471cbc9479873022d39b6f03447993d
+  metadata.gz: f2507e4cf8ddba6bc18f92e4e94e189952b7841a8fc3a6a466b38326b8f70f7f407ea0985c31b2459a0c43b32f9450150317ae4dc4ca4171af5d7384d840a133
+  data.tar.gz: 90a69e82def3664778c36c3617d7700ff8c5dbfd590a2d01d59addbede675bba08f3ced38638c69b6a132b1bb7c55f0344ca2391f6d5ee27c5d542c8a87a3dbd

data/dslimple.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rubocop'
 
-  spec.add_dependency 'dnsimple', '~> 2.1'
+  spec.add_dependency 'dnsimple', '~> 3.0'
   spec.add_dependency 'thor', '~> 0.19'
 end

data/lib/dslimple/applier.rb

@@ -6,12 +6,13 @@ class Dslimple::Applier
     addition: :green,
     modification: :yellow,
     deletion: :red
-  }
+  }.freeze
 
-  attr_reader :api_client, :shell, :options
+  attr_reader :api_client, :account, :shell, :options
 
-  def initialize(api_client, shell, options = {})
+  def initialize(api_client, account, shell, options = {})
     @api_client = api_client
+    @account = account
     @shell = shell
     @options = options
   end
@@ -41,14 +42,14 @@ class Dslimple::Applier
   end
 
   def fetch_domains
-    domains = api_client.domains.list.map { |domain| Dslimple::Domain.new(domain.name, api_client, id: domain.id) }
+    domains = api_client.domains.all_domains(account.id).data.map { |domain| Dslimple::Domain.new(domain.name, api_client, account, id: domain.id) }
     domains.each(&:fetch_records!)
     domains.select! { |domain| options[:only].include?(domain.name) } if options[:only].any?
     domains
   end
 
   def show_plan(queries)
-    shell.say("Changes", :bold)
+    shell.say('Changes', :bold)
     queries.each do |query|
       show_query(query)
     end
@@ -58,11 +59,11 @@ class Dslimple::Applier
     shell.say('Apply', :bold)
     queries.each do |query|
       show_query(query)
-      query.execute(api_client)
+      query.execute(api_client, account)
     end
   end
 
   def show_query(query)
-    shell.say("#{shell.set_color(query.operation.to_s[0..2], OPERATION_COLORS[query.operation])} #{query.to_s}")
+    shell.say("#{shell.set_color(query.operation.to_s[0..2], OPERATION_COLORS[query.operation])} #{query}")
   end
 end

data/lib/dslimple/cli.rb

@@ -23,7 +23,7 @@ class Dslimple::CLI < Thor
   method_option :modeline, type: :boolean, default: false, aliases: %w(-m), desc: 'Export with modeline for Vim'
   method_option :soa_and_ns, type: :boolean, default: false, desc: 'Export without SOA and NS records'
   def export
-    exporter = Dslimple::Exporter.new(api_client, options)
+    exporter = Dslimple::Exporter.new(api_client, account, options)
 
     exporter.execute
   rescue => e
@@ -39,7 +39,7 @@ class Dslimple::CLI < Thor
   method_option :deletion, type: :boolean, default: true, desc: 'Delete unspecified records'
   method_option :yes, type: :boolean, default: false, aliases: %w(-y), desc: 'Do not confirm on before apply'
   def apply
-    applier = Dslimple::Applier.new(api_client, self, options)
+    applier = Dslimple::Applier.new(api_client, account, self, options)
 
     applier.execute
   rescue => e
@@ -50,12 +50,16 @@ class Dslimple::CLI < Thor
 
   private
 
+  def account
+    @account ||= api_client.identity.whoami.data[:account]
+  end
+
   def api_client
     @api_client ||= Dnsimple::Client.new(
       username: options[:email] || ENV['DSLIMPLE_EMAIL'],
-      api_token: options[:api_token] || ENV['DSLIMPLE_API_TOKEN'],
+      access_token: options[:api_token] || ENV['DSLIMPLE_API_TOKEN'] || ENV['DSLIMPLE_ACCESS_TOKEN'],
       domain_api_token: options[:domain_token] || ENV['DSLIMPLE_DOMAIN_TOKEN'],
-      api_endpoint: options[:sandbox] ? SANDBOX_API_ENDPOINT : nil,
+      base_url: options[:sandbox] ? SANDBOX_API_ENDPOINT : nil,
       user_agent: USER_AGENT
     )
   end

data/lib/dslimple/domain.rb

@@ -2,12 +2,13 @@ require 'dslimple'
 
 class Dslimple::Domain
   attr_reader :name, :id
-  attr_accessor :api_client, :records
+  attr_accessor :api_client, :account, :records
 
-  def initialize(name, api_client, options = {})
+  def initialize(name, api_client, account, options = {})
     @name = name
     @id = options[:id]
     @api_client = api_client
+    @account = account
     @records = []
   end
 
@@ -20,8 +21,8 @@ class Dslimple::Domain
   end
 
   def fetch_records
-    api_client.domains.records(name).map do |record|
-      Dslimple::Record.new(self, record.record_type, record.name, record.content, ttl: record.ttl, priority: record.priority, id: record.id)
+    api_client.zones.all_records(account.id, name).data.map do |record|
+      Dslimple::Record.new(self, record.type, record.name, record.content, ttl: record.ttl, priority: record.priority, id: record.id)
     end
   end
 

data/lib/dslimple/dsl.rb

@@ -40,7 +40,7 @@ class Dslimple::DSL
 
   def transform
     @domains.map do |domain|
-      Dslimple::Domain.new(domain.name, nil).tap do |model|
+      Dslimple::Domain.new(domain.name, nil, nil).tap do |model|
         model.records = domain.records.map do |record|
           Dslimple::Record.new(model, record.options[:type], record.name, record.content, record.options)
         end

data/lib/dslimple/exporter.rb

@@ -2,10 +2,11 @@ require 'pathname'
 require 'dslimple'
 
 class Dslimple::Exporter
-  attr_reader :api_client, :options, :domains
+  attr_reader :api_client, :account, :options, :domains
 
-  def initialize(api_client, options)
+  def initialize(api_client, account, options)
     @api_client = api_client
+    @account = account
     @options = options
     @domains = []
   end
@@ -21,7 +22,7 @@ class Dslimple::Exporter
   end
 
   def fetch_domains
-    domains = api_client.domains.list.map { |domain| Dslimple::Domain.new(domain.name, api_client) }
+    domains = api_client.domains.all_domains(account.id).data.map { |domain| Dslimple::Domain.new(domain.name, api_client, account) }
     domains.each(&:fetch_records!)
     domains.select! { |domain| options[:only].include?(domain.name) } unless options[:only].empty?
     domains

data/lib/dslimple/query.rb

@@ -20,7 +20,7 @@ class Dslimple::Query
 
   def to_s
     if target == :domain
-      "#{domain.name}"
+      domain.name.to_s
     else
       %(#{params[:record_type].to_s.rjust(5)} #{params[:name].to_s.rjust(10)}.#{domain.name} (#{record_options.join(', ')}) "#{params[:content]}")
     end
@@ -34,27 +34,27 @@ class Dslimple::Query
     options
   end
 
-  def execute(api_client)
-    __send__("execute_#{target}", api_client)
+  def execute(api_client, account)
+    __send__("execute_#{target}", api_client, account)
   end
 
-  def execute_domain(api_client)
+  def execute_domain(api_client, account)
     case operation
     when :addition
-      api_client.domains.create(name: domain.name)
+      api_client.registrar.register_domain(account.id, domain.name, registrant_id: account.id, auto_renew: true)
     when :deletion
-      api_client.domains.delete(domain.name)
+      api_client.domains.delete_domain(account.id, domain.name)
     end
   end
 
-  def execute_record(api_client)
+  def execute_record(api_client, account)
     case operation
     when :addition
-      api_client.domains.create_record(domain.name, params)
+      api_client.zones.create_record(account.id, domain.name, params)
     when :modification
-      api_client.domains.update_record(domain.name, params[:id], params)
+      api_client.zones.update_record(account.id, domain.name, params[:id], params)
     when :deletion
-      api_client.domains.delete_record(domain.name, params[:id])
+      api_client.zones.delete_record(account.id, domain.name, params[:id])
     end
   end
 end

data/lib/dslimple/record.rb

@@ -100,11 +100,11 @@ EOD
   def to_params
     {
       id: id,
-      record_type: type.to_s.upcase,
+      type: type.to_s.upcase,
       name: name,
       content: content,
       ttl: ttl,
-      prio: priority
+      priority: priority
     }
   end
 

data/lib/dslimple/version.rb

@@ -1,3 +1,3 @@
 module Dslimple
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dslimple
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Sho Kusano
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement