fog-softlayer 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,15 @@
---- 
-SHA1: 
-  data.tar.gz: 603a92b8df5d52e401e355800b18e9bd8212a1ad
-  metadata.gz: c04b468d48832beb929584ebffaf958c2e4511d3
-SHA512: 
-  data.tar.gz: 1482ca7a4cbfb56189127d900541218c343b3eb0f93063e72f52fa9b526bbe0d66f78e8ca033ecc8b59d41d2d78bb2c796f928e5beb0692d0513cbd7f59a76b8
-  metadata.gz: 06f30a5d29b281c089729822bcaf6cc734bdc37012349e47507863920ebb7a6c98da013c33b7fd1b28f24fdf53bdfc2bda5ad15a24f69536aeb4e2bd2666b45e
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjY5ZGRiZWQ0NGZlNTRjMTJmZjNjYTU5ODU4MGI3ZTA4NjQxM2M5Mg==
+  data.tar.gz: !binary |-
+    ODkzYmYxMWZjODc1OWViZjdiMjNiMjgyMjk0ZWZjYTVkOTcwMzE4MQ==
+SHA512:
+  metadata.gz: !binary |-
+    OGYyYTkxMTMwOWMzMGY1ZWQyMDZiMDVjM2JlZGY2ZGFkMDQ2NDA2ZWY0Njk4
+    YTFjNDFhMDYxMzMxMjdjZTM3MmZiNzY4NTliMTg0NjFlYzMyZjM3ZDQ3MzM3
+    ZDI0YWI5ODBmNDZkNWI4MzJjMzY5OGE4MmFhNGE0Nzg3MWQyZTc=
+  data.tar.gz: !binary |-
+    MDE5OWJmNTQ3YjQyZGNlMTljYTFlMzcwNWEyODJkYmFmOTI3MmI2NzVkMjNi
+    ZjgzMDhlMGQzMmJmNzc0N2ZjOGQ0YWI0NjAyOTVkZDdhM2Y5NWJkMGRhMGRk
+    MmIyNDI2YzQyMjIyYzNkNjU4NTg3MTdiYjQ5MzcwN2EzOWI3NGU=

data/.gitignore

@@ -1 +1,29 @@
+.idea*
+*~
+*.gem
+*.rbc
+*.sw?
+.rbenv
+.rvmrc
+.ruby-gemset
+.ruby-version
+.bundle
+.DS_Store
+.idea
+.yardoc
+/tests/.fog
+bin/*
+!bin/fog
+.fog
+coverage
+doc/*
+docs/_site/*
+docs/about/supported_services.markdown
 Gemfile.lock
+gemfiles/*.lock
+yardoc
+pkg
+spec/credentials.yml
+vendor/*
+tags
+

data/Gemfile

@@ -1,3 +1,10 @@
 source "https://rubygems.org"
 
+group :development, :test do
+  # This is here because gemspec doesn't support require: false
+  gem 'coveralls', :require => false
+  gem 'netrc', :require => false
+  gem 'octokit', :require => false
+end
+
 gemspec

data/Rakefile

@@ -9,8 +9,232 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
+#task :default => :test
+#
+#Rake::TestTask.new do |t|
+#  t.pattern = File.join("spec", "**", "*_spec.rb")
+#end
+
+require 'bundler/setup'
+require 'rake/testtask'
+require 'date'
+require 'rubygems'
+require 'rubygems/package_task'
+require 'yard'
+require File.dirname(__FILE__) + '/lib/fog'
+
+#############################################################################
+#
+# Helper functions
+#
+#############################################################################
+
+def name
+  @name ||= Dir['*.gemspec'].first.split('.').first
+end
+
+def version
+  Fog::VERSION
+end
+
+def date
+  Date.today.to_s
+end
+
+def rubyforge_project
+  name
+end
+
+def gemspec_file
+  "#{name}.gemspec"
+end
+
+def gem_file
+  "#{name}-#{version}.gem"
+end
+
+def replace_header(head, header_name)
+  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
+end
+
+#############################################################################
+#
+# Standard tasks
+#
+#############################################################################
+
+GEM_NAME = "#{name}"
 task :default => :test
+task :travis  => ['test', 'test:travis', 'coveralls_push_workaround']
 
 Rake::TestTask.new do |t|
-  t.pattern = File.join("spec", "**", "*_spec.rb")
+  t.pattern = File.join("**", "spec", "**", "*_spec.rb")
+end
+
+namespace :test do
+  mock = 'true' || ENV['FOG_MOCK']
+  task :travis do
+    # jruby coveralls causes an OOM in travis
+    ENV['COVERAGE'] = 'false' if RUBY_PLATFORM == 'java'
+    sh("export FOG_MOCK=#{mock} && bundle exec shindont")
+  end
+  task :vsphere do
+    sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/vsphere")
+  end
+  task :openvz do
+    sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/openvz")
+  end
+end
+
+desc 'Run mocked tests for a specific provider'
+task :mock, :provider do |t, args|
+  if args.to_a.size != 1
+    fail 'USAGE: rake mock[<provider>]'
+  end
+  provider = args[:provider]
+  sh("export FOG_MOCK=true && bundle exec shindont tests/#{provider}")
+end
+
+desc 'Run live tests against a specific provider'
+task :live, :provider do |t, args|
+  if args.to_a.size != 1
+    fail 'USAGE: rake live[<provider>]'
+  end
+  provider = args[:provider]
+  sh("export FOG_MOCK=false PROVIDER=#{provider} && bundle exec shindont tests/#{provider}")
+end
+
+task :nuke do
+  Fog.providers.each do |provider|
+    next if ['Vmfusion'].include?(provider)
+    begin
+      compute = Fog::Compute.new(:provider => provider)
+      for server in compute.servers
+        Formatador.display_line("[#{provider}] destroying server #{server.identity}")
+        server.destroy rescue nil
+      end
+    rescue
+    end
+    begin
+      dns = Fog::DNS.new(:provider => provider)
+      for zone in dns.zones
+        for record in zone.records
+          record.destroy rescue nil
+        end
+        Formatador.display_line("[#{provider}] destroying zone #{zone.identity}")
+        zone.destroy rescue nil
+      end
+    rescue
+    end
+  end
+end
+
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -r ./lib/#{name}.rb"
+end
+
+#############################################################################
+#
+# Packaging tasks
+#
+#############################################################################
+
+task :release => ["release:prepare", "release:publish"]
+
+namespace :release do
+  task :preflight do
+    unless `git branch` =~ /^\* master$/
+      puts "You must be on the master branch to release!"
+      exit!
+    end
+    if `git tag` =~ /^\* v#{version}$/
+      puts "Tag v#{version} already exists!"
+      exit!
+    end
+  end
+
+  task :prepare => :preflight do
+    Rake::Task[:build].invoke
+    sh "gem install pkg/#{name}-#{version}.gem"
+    Rake::Task[:git_mark_release].invoke
+  end
+
+  task :publish do
+    Rake::Task[:git_push_release].invoke
+    Rake::Task[:gem_push].invoke
+  end
+end
+
+task :git_mark_release do
+  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git tag v#{version}"
+end
+
+task :git_push_release do
+  sh "git push origin master"
+  sh "git push origin v#{version}"
+end
+
+task :gem_push do
+  sh "gem push pkg/#{name}-#{version}.gem"
+end
+
+desc "Build fog-#{version}.gem"
+task :build => :gemspec do
+  sh "mkdir -p pkg"
+  sh "gem build #{gemspec_file}"
+  sh "mv #{gem_file} pkg"
+end
+task :gem => :build
+
+desc "Updates the gemspec and runs 'validate'"
+task :gemspec => :validate do
+  # read spec file and split out manifest section
+  spec = File.read(gemspec_file)
+
+  # replace name version and date
+  replace_header(spec, :name)
+  replace_header(spec, :version)
+  replace_header(spec, :date)
+  #comment this out if your rubyforge_project has a different name
+  replace_header(spec, :rubyforge_project)
+
+  File.open(gemspec_file, 'w') { |io| io.write(spec) }
+  puts "Updated #{gemspec_file}"
+end
+
+desc "Run before pushing out the code"
+task :validate do
+  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}", "lib/tasks"]
+  unless libfiles.empty?
+    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
+    exit!
+  end
+  unless Dir['VERSION*'].empty?
+    puts "A `VERSION` file at root level violates Gem best practices."
+    exit!
+  end
+end
+
+# Include Yard tasks for rake yard
+YARDOC_LOCATION = "doc"
+YARD::Rake::YardocTask.new do |t|
+  t.files   = ['lib/**/*.rb', "README"]
+  t.options = ["--output-dir", YARDOC_LOCATION, "--title", "#{name} #{version}"]
+end
+
+require "tasks/changelog_task"
+Fog::Rake::ChangelogTask.new
+
+require "tasks/github_release_task"
+Fog::Rake::GithubReleaseTask.new
+
+task :coveralls_push_workaround do
+  use_coveralls = (Gem::Version.new(RUBY_VERSION) > Gem::Version.new('1.9.2'))
+  if (ENV['COVERAGE'] != 'false') && use_coveralls
+    require 'coveralls/rake/task'
+    Coveralls::RakeTask.new
+    Rake::Task["coveralls:push"].invoke
+  end
 end

data/fog-softlayer.gemspec

@@ -19,10 +19,20 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "fog-core"
-  spec.add_dependency "fog-json"
+  spec.add_dependency 'fog'
+  spec.add_dependency 'fog-core'
+  spec.add_dependency 'fog-json'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency('minitest')
+  spec.add_development_dependency('jekyll') unless RUBY_PLATFORM == 'java'
+  spec.add_development_dependency('rake')
+  spec.add_development_dependency('rbvmomi')
+  spec.add_development_dependency('yard')
+  spec.add_development_dependency('thor')
+  spec.add_development_dependency('rbovirt', '0.0.24')
+  spec.add_development_dependency('shindo', '~> 0.3.4')
+  spec.add_development_dependency('fission')
+  spec.add_development_dependency('pry')
+  spec.add_development_dependency('google-api-client', '~> 0.6', '>= 0.6.2')
 end

data/lib/fog.rb

@@ -0,0 +1,29 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+# necessary when requiring fog without rubygems while also
+# maintaining ruby 1.8.7 support (can't use require_relative)
+__LIB_DIR__ = File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH.unshift __LIB_DIR__ unless $LOAD_PATH.include?(__LIB_DIR__)
+
+# Use fog and core
+require 'fog/core'
+require 'fog'
+
+# Previously treated as "core"
+# data exchange specific (to be extracted and used on a per provider basis)
+require 'fog/xml'
+require 'fog/json'
+require 'fog/core/parser'
+
+# deprecation wrappers (XML wrapped version)
+require 'fog/core/deprecated/connection'
+require 'fog/core/deprecated_connection_accessors'
+
+# any one of these can be required separately.
+# they all depend on fog/core for shared functionality.
+require 'fog/softlayer'

data/lib/fog/softlayer.rb

@@ -1 +1,9 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+require 'fog'
+require 'fog/softlayer'
 require 'fog/softlayer/compute'

data/lib/fog/softlayer/compute.rb

@@ -21,8 +21,6 @@ module Fog
       recognizes :softlayer_default_domain
 
 
-      #service = File.basename(__FILE__, '.rb')
-
       model_path 'fog/softlayer/models/compute'
       collection    :flavors
       model         :flavor
@@ -31,15 +29,6 @@ module Fog
       collection    :servers
       model         :server
 
-      #Fog::Softlayer.loader("models/#{service}") do |basename|
-      #  if basename =~ /s$/
-      #  collection basename
-      #  else
-      #    model basename
-      #  end
-      #
-      #end
-
       request_path 'fog/softlayer/requests/compute'
       request :create_bare_metal_server
       request :create_vm
@@ -51,10 +40,6 @@ module Fog
       request :get_vm
       request :get_vms
 
-      #Fog::Softlayer.loader("requests/#{service}") do |basename|
-      #  request basename
-      #end
-
       # The Mock Service allows you to run a fake instance of the Service
       # which makes no real connections.
       #

data/lib/fog/softlayer/core.rb

@@ -1,3 +1,9 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
 require 'fog/core'
 require 'fog/json'
 require 'time'
@@ -10,14 +16,6 @@ module Fog
 
     service(:compute, 'Compute')
 
-    def self.loader(service)
-      path = "providers/softlayer/lib/fog/softlayer/#{service}"
-      Dir.entries(path).reject{|e| e =~ /^\./}.each do |file|
-        _request = File.basename(file, '.rb')
-        yield _request.to_sym
-      end
-    end
-
     def self.mock_account_id
       Fog.mocking? and @sl_account_id ||= Fog::Mock.random_numbers(7)
     end

data/lib/fog/softlayer/version.rb

@@ -1,5 +1,11 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
 module Fog
   module Softlayer
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/spec/fog/compute/softlayer_spec.rb

@@ -1,3 +1,9 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
 require "minitest/autorun"
 require "fog/softlayer"