bb8 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce698dad7541161007a7c53b2b6c96b7ef933b21
-  data.tar.gz: 0fe6140febe6b98e72b8d065684339024f139579
+  metadata.gz: 5f54c2857060d4c328cb1063a69c8fd294e062ee
+  data.tar.gz: 9fe628260d9068b4a3873fb6f4f37c5d6e82354e
 SHA512:
-  metadata.gz: e8e478a8956d128ad4cb50564bdb572bfa2ecdc81ded9e24fc698e9e8455c5ab8607fd14ce48a816da25805fe2e2ac5c540cfc60bf19397ba0e29b8c08959741
-  data.tar.gz: 3d46715a49d1e50fcca1d787ab22ebd68162a385feb576f4ad7098d7954a25896c3e674f7ae24c24a12cb2e05eed484cebf5560184fb6e236b448ee8a60621d1
+  metadata.gz: 8cf2e2640ce2233cd262dfffc1361eae169edccf1afc9779ff62d35734a55fb4a6f27f57ede199c4ef89a3f2c415e4cbd473edbefb8bec795b99506a15595bff
+  data.tar.gz: 6da423cf3ddfe53d517be7b9430fb69f03baa5fe400d691665a1ee994e072922673661b8d41b742a0eb09e15e0744064c37dfb585a6f5cb99d7e5d7cf2d99f41

data/README.markdown

@@ -22,9 +22,9 @@ Then move into your project's directory (i.e. `cd servers`). You'll want to add
 
 The next step is to set up an environment:
 
-    $ bb8 staging init my-servers-staging
+    $ bb8 environment staging my-servers-staging
 
-The order of arguments is as follows: the name of the environment, the `init` command, and the name of a bundle of Voltos settings. BB-8 will create the latter for you, if you've not already done so.
+The arguments are the name of the environment (in this case, `staging`), and the name of a bundle of Voltos settings. BB-8 will create the latter for you, if you've not already done so.
 
 From this point on, you'll want to issue Terraform commands through BB-8 and a specified environment:
 

data/bb8.gemspec

@@ -20,8 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |file| File.basename(file) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "curb",    "~> 0.9.3"
-  spec.add_runtime_dependency "voltos",  "~> 0.3"
+  spec.add_runtime_dependency "faraday", "~> 0.10.0"
 
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/bb8.rb

@@ -1,9 +1,8 @@
-require 'curb'
+require 'faraday'
 require 'fileutils'
 require 'json'
 require 'openssl'
 require 'securerandom'
-require 'voltos'
 
 module BB8
   module Commands
@@ -11,7 +10,6 @@ module BB8
 end
 
 require 'bb8/cli'
-require 'bb8/commands/environment'
 require 'bb8/commands/help'
 require 'bb8/commands/initialise_environment'
 require 'bb8/commands/initialise_project'
@@ -21,5 +19,4 @@ require 'bb8/decrypt'
 require 'bb8/encrypt'
 require 'bb8/set_encryption_keys'
 require 'bb8/version'
-require 'bb8/voltos_api'
-require 'bb8/voltos_variables'
+require 'bb8/voltos'

data/lib/bb8/cli.rb

@@ -7,8 +7,10 @@ class BB8::CLI
       BB8::Commands::InitialiseProject.call arguments[1]
     when 'version'
       BB8::Commands::Version.call
+    when 'environment'
+      BB8::Commands::InitialiseEnvironment.call arguments[1], arguments[2]
     when *environments
-      BB8::Commands::Environment.call *arguments
+      BB8::Commands::Terraform.call(*arguments)
     else
       BB8::Commands::Help.call
     end

data/lib/bb8/commands/help.rb

@@ -7,10 +7,12 @@ Usage:
 
   bb8 init .                                Set up a directory as a git
                                             repository.
-  bb8 ENVIRONMENT init                      Set up a directory for a specific
+  bb8 environment staging my-voltos-bundle  Set up a directory for a specific
                                             environment.
   bb8 ENVIRONMENT [show|apply|destroy|...]  Run a Terraform command within a
                                             specific environment's context.
+  bb8 version                               Outputs BB8's version.
+  bb8 help                                  Outputs this information.
     MESSAGE
   end
 end

data/lib/bb8/commands/initialise_environment.rb

@@ -10,24 +10,31 @@ class BB8::Commands::InitialiseEnvironment
   def call
     FileUtils.mkdir_p name
     Dir.chdir name
+    File.write '.bb8_bundle', voltos_bundle
 
-    api.create_bundle voltos_bundle unless bundles.include? voltos_bundle
-    `voltos use #{voltos_bundle}`   unless set_bundle?
+    BB8::Voltos::Bundle.create voltos_bundle unless bundle_exists?
+    append_token unless set_bundle?
     BB8::SetEncryptionKeys.call
-
-    File.write '.bb8_bundle', voltos_bundle
   end
 
   private
 
   attr_reader :name, :voltos_bundle
 
-  def api
-    @api ||= BB8::VoltosAPI.new
+  def append_token
+    File.open('.env', 'a') do |file|
+      file.puts "VOLTOS_KEY=#{bundle.token}"
+    end
+  end
+
+  def bundle
+    @bundle ||= BB8::Voltos.bundles.detect { |bundle|
+      bundle.name == voltos_bundle
+    } || BB8::Voltos::Bundle.create(voltos_bundle)
   end
 
-  def bundles
-    api.bundles.collect { |bundle| bundle['name'] }
+  def bundle_exists?
+    BB8::Voltos.bundles.collect(&:name).include? voltos_bundle
   end
 
   def set_bundle?

data/lib/bb8/decrypt.rb

@@ -9,8 +9,8 @@ class BB8::Decrypt
 
   def call
     cipher.decrypt
-    cipher.key = variables['BB8_SECRET_KEY']
-    cipher.iv  = variables['BB8_SECRET_IV']
+    cipher.key = bundle.variables['BB8_SECRET_KEY']
+    cipher.iv  = bundle.variables['BB8_SECRET_IV']
 
     buffer = ""
     File.open(path.gsub('.enc', ''), "wb") do |output|
@@ -27,11 +27,11 @@ class BB8::Decrypt
 
   attr_reader :path
 
-  def cipher
-    @cipher ||= OpenSSL::Cipher.new('aes-256-cbc')
+  def bundle
+    @bundle ||= BB8::Voltos.current_bundle
   end
 
-  def variables
-    @variables ||= BB8::VoltosVariables.call
+  def cipher
+    @cipher ||= OpenSSL::Cipher.new('aes-256-cbc')
   end
 end

data/lib/bb8/encrypt.rb

@@ -9,8 +9,8 @@ class BB8::Encrypt
 
   def call
     cipher.encrypt
-    cipher.key = variables['BB8_SECRET_KEY']
-    cipher.iv  = variables['BB8_SECRET_IV']
+    cipher.key = bundle.variables['BB8_SECRET_KEY']
+    cipher.iv  = bundle.variables['BB8_SECRET_IV']
 
     buffer = ""
     File.open("#{path}.enc", "wb") do |output|
@@ -27,11 +27,11 @@ class BB8::Encrypt
 
   attr_reader :path
 
-  def cipher
-    @cipher ||= OpenSSL::Cipher.new('aes-256-cbc')
+  def bundle
+    @bundle ||= BB8::Voltos.current_bundle
   end
 
-  def variables
-    @variables ||= BB8::VoltosVariables.call
+  def cipher
+    @cipher ||= OpenSSL::Cipher.new('aes-256-cbc')
   end
 end

data/lib/bb8/set_encryption_keys.rb

@@ -4,15 +4,15 @@ class BB8::SetEncryptionKeys
   end
 
   def call
-    return if variables['BB8_SECRET_KEY']
+    return if bundle.variables['BB8_SECRET_KEY']
 
-    `voltos set BB8_SECRET_KEY=#{SecureRandom.hex(16)}`
-    `voltos set BB8_SECRET_IV=#{SecureRandom.hex(8)}`
+    bundle.set 'BB8_SECRET_KEY', SecureRandom.hex(16)
+    bundle.set 'BB8_SECRET_IV',  SecureRandom.hex(8)
   end
 
   private
 
-  def variables
-    @variables ||= BB8::VoltosVariables.call
+  def bundle
+    @bundle ||= BB8::Voltos.current_bundle
   end
 end

data/lib/bb8/version.rb

@@ -1,3 +1,3 @@
 module BB8
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/bb8/voltos.rb

@@ -0,0 +1,15 @@
+class BB8::Voltos
+  def self.bundles
+    api = BB8::Voltos::API.new
+    api.get("bundles").collect { |hash|
+      BB8::Voltos::Bundle.new hash['name'], api
+    }
+  end
+
+  def self.current_bundle
+    BB8::Voltos::Bundle.new File.read('.bb8_bundle')
+  end
+end
+
+require 'bb8/voltos/api'
+require 'bb8/voltos/bundle'

data/lib/bb8/voltos/api.rb

@@ -0,0 +1,46 @@
+class BB8::Voltos::API
+  DOMAIN   = 'https://api.voltos.io'
+  VERSION  = 'v1'
+  ENDPOINT = "#{DOMAIN}/#{VERSION}"
+
+  def get(path)
+    JSON.parse connection.get("#{VERSION}/#{path}").body
+  end
+
+  def put(path, params)
+    JSON.parse connection.put("#{VERSION}/#{path}", params).body
+  end
+
+  def post(path, params)
+    JSON.parse connection.post("#{VERSION}/#{path}", params).body
+  end
+
+  def create_bundle(name)
+    JSON.parse connection.post("#{VERSION}/bundles", {
+      :name       => name,
+      :token_name => 'BB8'
+    }).body
+  end
+
+  private
+
+  def configuration
+    @configuration ||= JSON.parse(
+      File.read(File.expand_path('~/.voltos/config.json'))
+    )
+  end
+
+  def connection
+    @connection ||= Faraday.new(:url => DOMAIN) do |faraday|
+      faraday.request :url_encoded
+      faraday.adapter Faraday.default_adapter
+
+      faraday.headers['User-Agent']    = "BB8/#{BB8::VERSION}"
+      faraday.headers['Authorization'] = "Token token=#{token}"
+    end
+  end
+
+  def token
+    configuration['auths']["#{ENDPOINT}"]['auth']
+  end
+end

data/lib/bb8/voltos/bundle.rb

@@ -0,0 +1,39 @@
+class BB8::Voltos::Bundle
+  attr_reader :name
+
+  def self.create(name, api = nil)
+    api    ||= BB8::Voltos::API.new
+    response = api.post("bundles", {
+      :name       => name,
+      :token_name => 'BB8'
+    })
+
+    new name, api, response['token']
+  end
+
+  def initialize(name, api = nil, token = nil)
+    @name  = name
+    @api   = api || BB8::Voltos::API.new
+    @token = token
+  end
+
+  def set(key, value)
+    api.put "/bundles/#{name}", "#{key}=#{value}"
+  end
+
+  def token
+    @token || new_token
+  end
+
+  def variables
+    @variables ||= api.get "/bundles/#{name}"
+  end
+
+  private
+
+  attr_reader :api
+
+  def new_token
+    api.post("/bundles/#{name}/token", :name => name)['token']
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bb8
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Pat Allan
@@ -11,33 +11,19 @@ cert_chain: []
 date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
-- !ruby/object:Gem::Dependency
-  name: voltos
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -72,7 +58,6 @@ files:
 - exe/bb8
 - lib/bb8.rb
 - lib/bb8/cli.rb
-- lib/bb8/commands/environment.rb
 - lib/bb8/commands/help.rb
 - lib/bb8/commands/initialise_environment.rb
 - lib/bb8/commands/initialise_project.rb
@@ -82,8 +67,9 @@ files:
 - lib/bb8/encrypt.rb
 - lib/bb8/set_encryption_keys.rb
 - lib/bb8/version.rb
-- lib/bb8/voltos_api.rb
-- lib/bb8/voltos_variables.rb
+- lib/bb8/voltos.rb
+- lib/bb8/voltos/api.rb
+- lib/bb8/voltos/bundle.rb
 homepage: https://github.com/pat/bb8
 licenses:
 - MIT
@@ -104,9 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Manage and share Terraform variables, environments, and states securely.
 test_files: []
-has_rdoc: 

data/lib/bb8/commands/environment.rb

@@ -1,10 +0,0 @@
-class BB8::Commands::Environment
-  def self.call(environment, command, *arguments)
-    case command
-    when 'init'
-      BB8::Commands::InitialiseEnvironment.call(environment, *arguments)
-    else
-      BB8::Commands::Terraform.call(environment, command, *arguments)
-    end
-  end
-end

data/lib/bb8/voltos_api.rb

@@ -1,34 +0,0 @@
-class BB8::VoltosAPI
-  DOMAIN   = 'https://api.voltos.io'
-  VERSION  = 'v1'
-  ENDPOINT = "#{DOMAIN}/#{VERSION}"
-
-  def bundles
-    JSON.parse Curl.get("#{ENDPOINT}/bundles") { |http|
-      http.headers['User-Agent']    = "BB8/#{BB8::VERSION}"
-      http.headers['Authorization'] = "Token token=#{token}"
-    }.body_str
-  end
-
-  def create_bundle(name)
-    JSON.parse Curl.post("#{ENDPOINT}/bundles", {
-      :name       => name,
-      :token_name => 'BB8'
-    }) { |http|
-      http.headers['User-Agent']    = "BB8/#{BB8::VERSION}"
-      http.headers['Authorization'] = "Token token=#{token}"
-    }.body_str
-  end
-
-  private
-
-  def configuration
-    @configuration ||= JSON.parse(
-      File.read(File.expand_path('~/.voltos/config.json'))
-    )
-  end
-
-  def token
-    configuration['auths']["#{ENDPOINT}"]['auth']
-  end
-end

data/lib/bb8/voltos_variables.rb

@@ -1,16 +0,0 @@
-class BB8::VoltosVariables
-  def self.call
-    new.call
-  end
-
-  def call
-    Voltos.configuration.api_key = voltos_api_key
-    Voltos.load
-  end
-
-  private
-
-  def voltos_api_key
-    @voltos_api_key ||= File.read('.env')[/VOLTOS_KEY=(\w+)/, 1]
-  end
-end