vagrant-1cloud 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f707ed0657b4714d685b8430fc3b29b8d941373e
-  data.tar.gz: e3366df7e2408f5932631877ec9cbbf5c9b8fbc8
+  metadata.gz: f8cb153e8157def4c77fce7141b534dd5cebbec1
+  data.tar.gz: a182fcd0abf52bc8d094db667d85ea82f7e8179e
 SHA512:
-  metadata.gz: 9651c55c3be75ea4d99ca8577f6a205f3231f0930fef12bb4361824bcda99b9cf0e17bf53fe001f783fc0f843341c12fb160bea43c89520d5bfae3a1f2ba3e7a
-  data.tar.gz: d31e13aadf3cd4eeb66efc5b02d7425873d3035a1674da296c15ed71207599df852768d6f31b45cce04f67d9a8a85897876831a43a979a89d8133d7b877d8d0c
+  metadata.gz: 29ad9e8961d8f4e8c557341252474cc6df9987e2814d5f646b8ac41c7c1cbd7eab17932f84014a0d37f3bf8cfb9102633a43f4e3db87ac87b177b3f79e0b6bf7
+  data.tar.gz: 022d8a0d51fb826c097e045170cbf192ae1ede02014415df26b7af573992b6caa019560c3854575135fda5f4d7a48f19d0ab126e21a6abe8044503dbfcb6b6be

data/Gemfile

@@ -1,10 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.7.2'
+gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.9.1'
 gem 'rake'
 
 group :plugins do
-  gem 'vagrant-1cloud', :path => '.'
-end
-
-gemspec
+  gem 'vagrant-1cloud', path: "."
+end

data/Rakefile

@@ -6,7 +6,6 @@ end
 
 task :test do
   result = sh 'bash test/test.sh'
-
   if result
     puts 'Success!'
   else
@@ -16,7 +15,7 @@ task :test do
 end
 
 def env
-  ['DO_CLIENT_ID', 'DO_API_KEY', 'VAGRANT_LOG'].inject('') do |acc, key|
+  ['OC_CLIENT_ID', 'OC_API_KEY', 'VAGRANT_LOG'].inject('') do |acc, key|
     acc += "#{key}=#{ENV[key] || 'error'} "
   end
-end
+end

data/build.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+PLUGIN_NAME="vagrant-1cloud"
+PLUGIN_VERSION=$(cat ${DIR}/lib/${PLUGIN_NAME}/version.rb | grep VERSION | awk -F= '{gsub(" ","");gsub("'\''","");print $2}')
+
+docker stop $(docker ps -a -q --filter label=${PLUGIN_NAME})
+
+docker pull docker.avtodoria.dev:5043/test/vagrant
+BUILDER_ID=$(docker run -it -d --rm --label ${PLUGIN_NAME} docker.avtodoria.dev:5043/test/vagrant)
+
+docker cp ${DIR}/../${PLUGIN_NAME} ${BUILDER_ID}:/tmp/
+
+docker exec -i ${BUILDER_ID} bash -c "cd /tmp/${PLUGIN_NAME} && \
+                                      git init && \
+                                      bundle config git.allow_insecure true && \
+                                      bundle install && \
+                                      bundle exec rake gem:build && \
+                                      bundle exec rake gem:install && \
+                                      bundle exec rake test"
+if [ $? -ne 0 ]; then
+    echo "${PLUGIN_NAME} plugin was not built successfully!"
+    docker stop $(docker ps -a -q --filter label=${PLUGIN_NAME})
+    exit 1
+fi
+
+mkdir -p ${DIR}/package
+docker cp ${BUILDER_ID}:/tmp/${PLUGIN_NAME}/pkg/${PLUGIN_NAME}-${PLUGIN_VERSION}.gem ${DIR}/package/${PLUGIN_NAME}.gem
+
+echo "${PLUGIN_NAME} plugin was built successfully."
+docker stop $(docker ps -a -q --filter label=${PLUGIN_NAME})
+exit 0

data/lib/vagrant-1cloud/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OneCloud
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
   end
 end

data/pom.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.avtodoria.dc.docker</groupId>
+    <artifactId>app.vagrant-1cloud</artifactId>
+    <name>docker.app.vagrant-1cloud</name>
+    <packaging>pom</packaging>
+    <version>2.0.0-SNAPSHOT</version>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.avtodoria.dc.vagrant-plugins</groupId>
+            <artifactId>vagrant-1cloud</artifactId>
+            <type>gem</type>
+            <version>2.0.0-SNAPSHOT</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>vagrant-1cloud</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>com.avtodoria.dc.vagrant-plugins</groupId>
+                                    <artifactId>vagrant-1cloud</artifactId>
+                                    <version>2.0.0-SNAPSHOT</version>
+                                    <type>gem</type>
+                                    <overWrite>true</overWrite>
+                                    <destFileName>vagrant-1cloud.gem</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>
+                                ${project.build.directory}
+                            </outputDirectory>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

data/test/Vagrantfile

@@ -8,7 +8,7 @@ Vagrant.configure('2') do |config|
       override.vm.hostname = 'test'
       override.vm.provision :shell, :path => 'scripts/provision.sh'
 
-      provider.token = ENV['DO_TOKEN']
+      provider.token = ENV['OC_TOKEN']
     end
   end
 end

data/test/test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+
 cd test
 
 bundle exec vagrant up --provider=onecloud

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-1cloud
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Bulat Yusupov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -59,11 +59,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- build.sh
 - lib/vagrant-1cloud.rb
 - lib/vagrant-1cloud/actions.rb
 - lib/vagrant-1cloud/actions/check_state.rb
@@ -90,6 +90,7 @@ files:
 - lib/vagrant-1cloud/provider.rb
 - lib/vagrant-1cloud/version.rb
 - locales/en.yml
+- pom.xml
 - test/Vagrantfile
 - test/scripts/provision.sh
 - test/test.sh
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage 1cloud droplets. Based on https://github.com/devopsgroup-io/vagrant-digitalocean.

data/.gitignore

@@ -1,13 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-vagrant-1cloud.iml
-/.idea/
-/.svn/
-.rake_tasks~