fling 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 733a75553cd0b08a377ca2d6d8381686b3464537
-  data.tar.gz: 7201c7c5658fcb5c3ffce91b41ac33c1634ee497
+  metadata.gz: 3b8b667ebbd60b71dd973163d999dd0ce6044097
+  data.tar.gz: 76becf99d58883de950d921ec384e3f5ab6045dd
 SHA512:
-  metadata.gz: 9caeb93a50c385d5b428376a2caecaec58f24ea23a21a33993a0f76fbfa5e3fb3aafa3b13bee49616f1728d3473893739cb0bd391c06deba8bbc2d9c20329276
-  data.tar.gz: b4ce71b08bb647771daad9069ee38c9b1053f10539b3e941c49719ae2976fcc806e6d332a744fc216ec28a126a0f3bc4ac53f58053e55375c6dd0383856ed3cf
+  metadata.gz: 91dc59256194ef07e8aca6caf8473f204025a86a48d422a8155f3860855817ec6cdd1d8f32980401cac3407bb87db481c47c55e20ead9990b44c0dcd9d1db406
+  data.tar.gz: 0ec72f48d23bd74b2cb5f98df7a178bdc7c62b8397df4b6ac9d8a03ecf3cf52a8b6ce6dc25e036fbe368105e5108a9006dea256249742c8894e01a9659a88707

data/.rubocop.yml

@@ -3,3 +3,10 @@ LineLength:
   
 Style/StringLiterals:
   EnforcedStyle: double_quotes
+
+Metrics/MethodLength:
+  CountComments: false
+  Max: 20
+
+Metrics/AbcSize:
+  Enabled: false

data/CHANGES.md

@@ -1,7 +1,12 @@
-0.0.2 (2014-04-22)
+0.0.3 (2015-05-31)
+------------------
+* Update to Tahoe-LAFS 1.10.1a1
+* Initial config parser
+
+0.0.2 (2015-04-22)
 ------------------
 * Try to actually publish the fling CLI executable
 
-0.0.1 (2014-04-22)
+0.0.1 (2015-04-22)
 ------------------
 * Initial release with support for "fling setup"

data/fling.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "colorize"
+  spec.add_runtime_dependency "base32"
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/fling/config.rb

@@ -0,0 +1,42 @@
+require "json"
+require "uri"
+
+module Fling
+  # Configuration for the local Tahoe cluster
+  class Config
+    CONFIG_KEYS = %w(introducer convergence salt dropcap)
+    attr_reader(*CONFIG_KEYS)
+
+    # Load configuration from a JSON file
+    def self.load_json(file)
+      from_json File.read(file)
+    end
+
+    # Parse configuration from JSON
+    def self.from_json(json)
+      new(JSON.parse(json))
+    end
+
+    def initialize(options = {})
+      CONFIG_KEYS.each do |key|
+        fail ArgumentError, "missing key: #{key}" unless options[key]
+        instance_variable_set("@#{key}", options[key])
+      end
+
+      fail ConfigError, "bad introducer: #{@introducer}" if URI(@introducer).scheme != "pb"
+      fail ConfigError, "bad dropcap: #{@dropcap}" unless @dropcap.start_with?("URI:DIR2:")
+
+      %w(convergence salt).each do |key|
+        b32_value = options[key]
+
+        begin
+          value = Encoding.decode(b32_value)
+        rescue
+          raise ConfigError, "bad #{key} (base32 error): #{b32_value}"
+        end
+
+        fail ConfigError, "bad #{key} (wrong size): #{b32_value}" if value.size != 32
+      end
+    end
+  end
+end

data/lib/fling/encoding.rb

@@ -0,0 +1,24 @@
+require "base32"
+
+module Fling
+  # Encoder/decoder for z-base-32 used by Tahoe-LAFS
+  module Encoding
+    module_function
+
+    # Encode a string in z-base-32
+    #
+    # @param string [String] arbitrary string to be encoded
+    # @return [String] lovely, elegant z-base-32
+    def encode(string)
+      Base32.encode(string).downcase.sub(/=+$/, "")
+    end
+
+    # Decode a z-base-32 string
+    #
+    # @param string [String] z-base-32 string to be decoded
+    # @return [String] decoded string
+    def decode(string)
+      Base32.decode(string.upcase)
+    end
+  end
+end

data/lib/fling/setup.rb

@@ -6,10 +6,10 @@ module Fling
   module Setup
     module_function
 
-    TAHOE_VERSION = "1.10.0"
+    TAHOE_VERSION = "1.10.1a1"
     TAHOE_DIR     = "allmydata-tahoe-#{TAHOE_VERSION}"
     TAHOE_ZIP     = "#{TAHOE_DIR}.zip"
-    TAHOE_SRC     = "https://tahoe-lafs.org/source/tahoe-lafs/releases/#{TAHOE_ZIP}"
+    TAHOE_SRC     = "https://tahoe-lafs.org/source/tahoe-lafs/tarballs/#{TAHOE_ZIP}"
 
     # Note something important just happened
     def ohai(msg)

data/lib/fling/version.rb

@@ -1,4 +1,4 @@
 # Simple secret sharing over Tahoe-LAFS
 module Fling
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/fling.rb

@@ -1,5 +1,9 @@
 require "fling/version"
 
+require "fling/config"
+require "fling/encoding"
+
 # Simple secret sharing over Tahoe-LAFS
 module Fling
+  ConfigError = Class.new(StandardError)
 end

data/spec/fixtures/fling.json

@@ -0,0 +1,6 @@
+{
+  "introducer": "pb://xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx@127.0.0.1:34567/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+  "convergence": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+  "salt": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+  "dropcap": "URI:DIR2:xxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+}

data/spec/fling/config_spec.rb

@@ -0,0 +1,48 @@
+require "spec_helper"
+
+RSpec.describe Fling::Config do
+  let(:introducer)  { "pb://#{'x' * 32}@127.0.0.1:34567/#{'x' * 32}" }
+  let(:convergence) { "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }
+  let(:salt)        { "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }
+  let(:dropcap)     { "URI:DIR2:#{'x' * 26}:#{'x' * 52}" }
+
+  it "parses JSON" do
+    config = described_class.from_json fixture("fling.json")
+
+    expect(config.introducer).to eq introducer
+    expect(config.convergence).to eq convergence
+    expect(config.salt).to eq salt
+    expect(config.dropcap).to eq dropcap
+  end
+
+  it "raises ArgumentError if a required key is missing" do
+    expect { described_class.new("bogus" => "true") }.to raise_error(ArgumentError)
+  end
+
+  context "ConfigError" do
+    let(:config_json) { JSON.parse(fixture("fling.json")) }
+    it "raises for malformed introducer URL" do
+      expect do
+        described_class.new(config_json.merge("introducer" => "pbandj"))
+      end.to raise_error(Fling::ConfigError)
+    end
+
+    it "raises for malformed dropcap URI" do
+      expect do
+        described_class.new(config_json.merge("dropcap" => "URI:DIR1"))
+      end.to raise_error(Fling::ConfigError)
+    end
+
+    it "raises for malformed convergence secret" do
+      expect do
+        described_class.new(config_json.merge("convergence" => "_not_valid_base32_"))
+      end.to raise_error(Fling::ConfigError)
+    end
+
+    it "raises for malformed salt" do
+      expect do
+        described_class.new(config_json.merge("salt" => "nacl"))
+      end.to raise_error(Fling::ConfigError)
+    end
+  end
+end

data/spec/fling/encoding_spec.rb

@@ -0,0 +1,14 @@
+require "spec_helper"
+
+RSpec.describe Fling::Encoding do
+  let(:source) { "XXXXXXXXXXXXXXXX" }
+  let(:base32) { "lbmfqwcylbmfqwcylbmfqwcyla" }
+
+  it "encodes to base32" do
+    expect(subject.encode(source)).to eq base32
+  end
+
+  it "decodes from base32" do
+    expect(subject.decode(base32)).to eq source
+  end
+end

data/spec/fling_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Fling do
+RSpec.describe Fling do
   it "has a version number" do
     expect(Fling::VERSION).not_to be nil
   end

data/spec/spec_helper.rb

@@ -3,3 +3,9 @@ Coveralls.wear!
 
 $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 require "fling"
+
+RSpec.configure(&:disable_monkey_patching!)
+
+def fixture(name)
+  File.read File.expand_path("../fixtures/#{name}", __FILE__)
+end

metadata

@@ -1,86 +1,101 @@
 --- !ruby/object:Gem::Specification
 name: fling
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tony Arcieri
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
+  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: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: colorize
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: base32
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: bundler
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-  prerelease: false
   type: :development
-description: Fling is a system for automating the exchange of files and directoriesover Tahoe-LAFS, a distributed encrypted filesystem.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+description: Fling is a system for automating the exchange of files and directoriesover
+  Tahoe-LAFS, a distributed encrypted filesystem.
 email:
 - bascule@gmail.com
 executables:
@@ -90,10 +105,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - Guardfile
@@ -105,8 +120,13 @@ files:
 - fling.gemspec
 - lib/fling.rb
 - lib/fling/cli.rb
+- lib/fling/config.rb
+- lib/fling/encoding.rb
 - lib/fling/setup.rb
 - lib/fling/version.rb
+- spec/fixtures/fling.json
+- spec/fling/config_spec.rb
+- spec/fling/encoding_spec.rb
 - spec/fling_spec.rb
 - spec/spec_helper.rb
 - tasks/rspec.rake
@@ -114,24 +134,24 @@ files:
 homepage: https://github.com/tarcieri/fling
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 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.4.5
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.6
+signing_key: 
 specification_version: 4
 summary: Simple secret sharing over Tahoe-LAFS
 test_files: []