clenver 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df349ceb9945165a4bf0f2c5e6258e8335544a79
-  data.tar.gz: 9f1362e7e826c8329987bf4f701e31a7d017f69a
+  metadata.gz: e6615635905444802e77cd25ff92232495181812
+  data.tar.gz: 7fbcb7463f62b4d328bf6cd80d1aa0255c4c8b2c
 SHA512:
-  metadata.gz: 59fc7a9e72442f9a98e40cf9a949e55b68b8fe9627c7a06b1e890a9b49814304f95ecfd94c8116fcda4dc94866fe1446436f613c12f474c5c08d0a9e52012a90
-  data.tar.gz: 12efe8b91b05f0a7cb425fb7f49abbb52e02dcb6fd1a609687388bfc202cc322f539ba054e3717777ee5e07fa36eaaa98e7e17678cc9580a069d38952a2e3659
+  metadata.gz: 17a40c5c82382d3b441cd27e065991113f1b7bad77495c94a307cf15c2173e608428fd70ac8ffcd37e719fdffc3ac9ea46c525fd154a2f566d5bf1bd0326f464
+  data.tar.gz: 4d70749859828c34c68f1fd7e9e26e77b1a142c8a07344e70b1835e9f27bfd9e89065e655ff86a2d1e76893cf2f4665eae8b3745ebedbbb9215167bb43349a94

data/.gitignore

@@ -16,3 +16,6 @@ tmp
 .yardoc
 _yardoc
 doc/
+
+# cucumber
+results.html

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clenver (0.1.10)
+    clenver (0.1.12)
       git (= 1.2.6)
       gli (= 2.8.0)
 

data/features/clenver_init.feature

@@ -79,6 +79,24 @@ Feature: Initialization
       | some_tmp/test_repo/foobar_link     |
       | some_tmp/test_repo/foobar_dir_link |
 
+   Scenario: files backup verification
+    Given The default aruba timeout is 10 seconds
+    Given a file named "test_repo.yml" with:
+    """
+    https://github.com/pietrushnic/dummy.git:
+      links:
+        foobar.txt:
+        - foobar_link
+        - foobar_link
+        foobar:
+        - foobar_dir_link
+    """
+    When I run `clenver init test_repo.yml some_tmp`
+    Then the following links should exist:
+      | some_tmp/test_repo/foobar_link     |
+      | some_tmp/test_repo/foobar_link_old |
+      | some_tmp/test_repo/foobar_dir_link |
+
    Scenario: use system variable in path
     Given The default aruba timeout is 10 seconds
     Given a file named "test_repo.yml" with:
@@ -166,19 +184,24 @@ Feature: Initialization
     When I run `clenver init test_repo.yml some_tmp`
     Then the output should contain "installed\n"
     Then the output should contain "success!!!!\n"
+
   @wip
-  Scenario: install gem and package
-    Given The default aruba timeout is 45 seconds
+  Scenario: install gems and packages
+    Given The default aruba timeout is 120 seconds
     Given a file named "test_repo.yml" with:
     """
     apt:
       - vim
+      - mutt
     gem:
       - tmuxinator
+      - git
     https://github.com/pietrushnic/dummy.git:
       run:
         - echo "success!!!!"
     """
     When I run `clenver init test_repo.yml some_tmp`
-    Then the output should contain "installed\n"
+    Then the output should contain "gems installed\n"
+    Then the output should contain "vim is already the newest version.\n"
+    Then the output should contain "mutt is already the newest version.\n"
     Then the output should contain "success!!!!\n"

data/lib/clenver/link.rb

@@ -1,4 +1,7 @@
+require 'fileutils'
+
 class Link
+  MAX_REPEAT = 3
   def initialize(src,dst)
     @src = src
     @dst = expand_dst(dst)
@@ -9,8 +12,17 @@ class Link
     @dst.each do |d|
       puts "src:#{@src}"
       puts "d:#{d} "
-
-      File.symlink(@src, d.to_s)
+      i = 0
+      while i < MAX_REPEAT do
+        begin
+          File.symlink(@src, d.to_s)
+        rescue SystemCallError
+          FileUtils.mv(d.to_s, d.to_s + "_old")
+        else
+          break
+        end
+        i += 1
+      end
     end
   end
   def expand_dst(dst)

data/lib/clenver/package_manager.rb

@@ -7,7 +7,7 @@ class PackageManger
   def install()
     case @name
     when 'apt'
-      out = %x[sudo apt-get install #{@pkgs}]
+      out = %x[sudo apt-get -y install #{@pkgs}]
     when 'gem'
       out = %x[gem install #{@pkgs}]
     end

data/lib/clenver/runner.rb

@@ -20,17 +20,19 @@ module Clenver
           logger.debug("yaml: #{yaml}")
           #TODO: create test and fix this place with check for empty file
           p = Project.new(File.basename("#{@path}", ".yml"), yaml, @dst)
+          pkgs = ""
           unless yaml['apt'].nil?
             for pkg in yaml['apt'] do
-              pkgs = pkg + " "
+              pkgs = pkgs + " " + pkg + " "
             end
             puts pkgs
             p_mgr = PackageManger.new('apt', pkgs)
             p_mgr.install()
           end
+          pkgs = ""
           unless yaml['gem'].nil?
             for pkg in yaml['gem'] do
-              pkgs = pkg + " "
+              pkgs = pkgs + " " + pkg + " "
             end
             puts pkgs
             p_mgr = PackageManger.new('gem', pkgs)

data/lib/clenver/version.rb

@@ -1,3 +1,3 @@
 module Clenver
-  VERSION = '0.1.10'
+  VERSION = '0.1.12'
 end

data/test/vbox/regression.sh

@@ -25,15 +25,21 @@ startvm() {
 }
 
 ssh_cmd () {
+    echo "ssh_cmd: $1"
     ssh -oStrictHostKeyChecking=no user@localhost -p 2222 $1
 }
 
 scp_cmd () {
+    echo "scp_cmd: $1 $2"
     scp -P 2222 -oStrictHostKeyChecking=no $1 user@localhost:$2
 }
 
 bash_cmd () {
-    ssh_cmd "bash -l -c $1"
+    st="bash -l -c '"
+    nd="$1"
+    rd="'"
+    echo "bash_cmd: $st$nd$rd"
+    ssh_cmd "$st$nd$rd"
 }
 
 no_pass_ssh () {
@@ -62,10 +68,10 @@ clenver_install() {
 }
 
 init_general () {
-   clenver_install $1
-   #ssh_cmd 'bash -l -c "clenver init http://bit.ly/1cpqEqp"'
-   ssh_cmd 'git clone https://github.com/pietrushnic/clenver_projects.git src/clenver_projects'
-   ssh_cmd 'bash -l -c "clenver init src/clenver_projects/general.yml"'
+    clenver_install $1
+    #ssh_cmd 'bash -l -c "clenver init http://bit.ly/1cpqEqp"'
+    ssh_cmd 'git clone https://github.com/pietrushnic/clenver_projects.git src/clenver_projects'
+    ssh_cmd 'bash -l -c "clenver init src/clenver_projects/general.yml"'
 }
 
 init_custom () {
@@ -73,6 +79,12 @@ init_custom () {
     scp_cmd $2 /home/user
     home_v='$HOME'
     nd_pt="/${2##*/}"
+    # use local gem
+    if [[ $# -ge 3 ]]; then
+        scp_cmd $3 /home/user
+        nd_pt="$nd_pt $3"
+        echo "nd_pt: $nd_pt"
+    fi
     bash_cmd "$home_v$nd_pt"
     ssh_cmd "git clone https://github.com/pietrushnic/clenver_projects.git src/clenver_projects"
     bash_cmd "clenver init $home_v/src/clenver_projects/general.yml"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clenver
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 platform: ruby
 authors:
 - Piotr Król
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake