cyoi 0.3.0 → 0.4.0

data/ChangeLog.md

@@ -2,6 +2,10 @@
 
 Cyoi (choose-your-own-infrastructure) is a library to ask an end-user to choose an infrastructure (AWS, OpenStack, etc), region, and login credentials.
 
+## v0.4
+
+* switch to using readwritesettings instead of fork of settingslogic
+
 ## v0.3
 
 * added `cyoi keypair` & `cyoi key_pair`

data/Gemfile

@@ -3,8 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in cyoi.gemspec
 gemspec
 
-gem "settingslogic", github: "drnic/settingslogic", branch: "integration"
-
 group :development do
   gem "awesome_print"
   gem "rb-fsevent", "~> 0.9.1"

data/README.md

@@ -53,19 +53,16 @@ settings["provider"]["credentials"] # aws or openstack URLs & credentials
 
 ## Installation
 
-Add this line to your application's Gemfile:
+To use as a stand-alone CLI, install the rubygem:
 
 ```
-gem "cyoi"
-gem "settingslogic", github: "drnic/settingslogic", branch: "integration"
+$ gem install cyoi
 ```
 
-NOTE: The `settingslogic` fork is necessary for some unmerged/unreleased extensions.
-
-And then execute:
+To use it as a library within your own application, add this line to your application's Gemfile:
 
 ```
-$ bundle
+gem "cyoi"
 ```
 
 ## Contributing

data/cyoi.gemspec

@@ -24,7 +24,7 @@ README
 
   spec.add_dependency "fog"
   spec.add_dependency "highline", "~> 1.6"
-  spec.add_dependency "settingslogic", "~> 2.0.9" # need to_nested_hash method
+  spec.add_dependency "readwritesettings", "~> 3.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/cyoi/cli/auto_detection.rb

@@ -8,8 +8,8 @@ class Cyoi::Cli::AutoDetection::UI
 
   def initialize(attributes, highline)
     @hl = highline
-    @attributes = attributes.is_a?(Hash) ? Settingslogic.new(attributes) : attributes
-    raise "@attributes must be Settingslogic (or Hash)" unless @attributes.is_a?(Settingslogic)
+    @attributes = attributes.is_a?(Hash) ? ReadWriteSettings.new(attributes) : attributes
+    raise "@attributes must be ReadWriteSettings (or Hash)" unless @attributes.is_a?(ReadWriteSettings)
   end
 
   def perform

data/lib/cyoi/cli/helpers/settings.rb

@@ -1,4 +1,4 @@
-require "settingslogic"
+require "readwritesettings"
 require "fileutils"
 
 module Cyoi::Cli::Helpers::Settings
@@ -29,12 +29,12 @@ module Cyoi::Cli::Helpers::Settings
       end
       chmod(0600, settings_path)
       chmod(0700, settings_ssh_dir) if File.directory?(settings_ssh_dir)
-      Settingslogic.new(settings_path)
+      ReadWriteSettings.new(settings_path)
     end
   end
 
-  # Saves current nested Settingslogic into pure Hash-based YAML file
-  # Recreates accessors on Settingslogic object (since something has changed)
+  # Saves current nested ReadWriteSettings into pure Hash-based YAML file
+  # Recreates accessors on ReadWriteSettings object (since something has changed)
   def save_settings!
     File.open(settings_path, "w") { |f| f << settings.to_nested_hash.to_yaml }
     settings.create_accessors!

data/lib/cyoi/cli/provider_addresses/address_cli_aws.rb

@@ -7,8 +7,8 @@ class Cyoi::Cli::Addresses::AddressCliAws
   def initialize(provider_client, attributes, highline)
     @provider_client = provider_client
     @hl = highline
-    @attributes = attributes.is_a?(Hash) ? Settingslogic.new(attributes) : attributes
-    raise "@attributes must be Settingslogic (or Hash)" unless @attributes.is_a?(Settingslogic)
+    @attributes = attributes.is_a?(Hash) ? ReadWriteSettings.new(attributes) : attributes
+    raise "@attributes must be ReadWriteSettings (or Hash)" unless @attributes.is_a?(ReadWriteSettings)
   end
 
   def perform_and_return_attributes

data/lib/cyoi/cli/provider_key_pair/key_pair_aws.rb

@@ -7,8 +7,8 @@ class Cyoi::Cli::KeyPair::KeyPairCliAws
   def initialize(provider_client, attributes, highline)
     @provider_client = provider_client
     @hl = highline
-    @attributes = attributes.is_a?(Hash) ? Settingslogic.new(attributes) : attributes
-    raise "@attributes must be Settingslogic (or Hash)" unless @attributes.is_a?(Settingslogic)
+    @attributes = attributes.is_a?(Hash) ? ReadWriteSettings.new(attributes) : attributes
+    raise "@attributes must be ReadWriteSettings (or Hash)" unless @attributes.is_a?(ReadWriteSettings)
     raise "@attributes.name must be set" unless @attributes["name"]
   end
 

data/lib/cyoi/cli/providers/provider_cli.rb

@@ -6,8 +6,8 @@ class Cyoi::Cli::Providers::ProviderCli
 
   def initialize(attributes, highline)
     @hl = highline
-    @attributes = attributes.is_a?(Hash) ? Settingslogic.new(attributes) : attributes
-    raise "@attributes must be Settingslogic (or Hash)" unless @attributes.is_a?(Settingslogic)
+    @attributes = attributes.is_a?(Hash) ? ReadWriteSettings.new(attributes) : attributes
+    raise "@attributes must be ReadWriteSettings (or Hash)" unless @attributes.is_a?(ReadWriteSettings)
   end
 
   # helper to export the complete nested attributes.

data/lib/cyoi/providers.rb

@@ -9,7 +9,7 @@ module Cyoi::Providers
   # with helpers related to that provider
   # returns nil if +attributes.name+ is unknown
   def provider_client(attributes)
-    attributes = attributes.is_a?(Hash) ? Settingslogic.new(attributes) : attributes
+    attributes = attributes.is_a?(Hash) ? ReadWriteSettings.new(attributes) : attributes
     case attributes.name.to_sym
     when :aws
       @aws_provider_client ||= begin

data/lib/cyoi/providers/clients/fog_provider_client.rb

@@ -8,8 +8,8 @@ class Cyoi::Providers::Clients::FogProviderClient
   attr_reader :attributes
 
   def initialize(attributes)
-    @attributes = attributes.is_a?(Hash) ? Settingslogic.new(attributes) : attributes
-    raise "@attributes must be Settingslogic (or Hash)" unless @attributes.is_a?(Settingslogic)
+    @attributes = attributes.is_a?(Hash) ? ReadWriteSettings.new(attributes) : attributes
+    raise "@attributes must be ReadWriteSettings (or Hash)" unless @attributes.is_a?(ReadWriteSettings)
     setup_fog_connection
   end
 

data/lib/cyoi/version.rb

@@ -1,3 +1,3 @@
 module Cyoi
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/integration/cli/key_pair/key_pair_aws_spec.rb

@@ -5,7 +5,7 @@ describe "cyoi key_pair aws" do
   before { @settings_dir = File.expand_path("~/.cyoi_client_lib") }
 
   it "fails nicely if provider.name missing" do
-    run_interactive(unescape("cyoi key_pair #{settings_dir}"))
+    run_interactive(unescape("cyoi key_pair testname #{settings_dir}"))
     assert_failing_with("Please run 'cyoi provider' first")
   end
 
@@ -19,10 +19,11 @@ describe "cyoi key_pair aws" do
     end
 
     it "create new key pair (didn't already exist in AWS)" do
+      run_interactive(unescape("cyoi key_pair testname #{settings_dir}"))
       assert_passing_with(<<-OUT)
-Provisioning new key pair microbosh-test-bosh... done
+Acquiring a key pair testname... done
 
-Confirm: Using key pair microbosh-test-bosh
+Confirming: Using key pair testname
       OUT
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyoi
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -44,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: settingslogic
+  name: readwritesettings
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3080735547903421665
+      hash: -3776246876278909178
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3080735547903421665
+      hash: -3776246876278909178
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25