Complete Berkshelf upgrade to stable release

mojolingo · May 8, 2014 · a49dc8c · a49dc8c
1 parent 13eb5db
commit a49dc8c
Show file tree

Hide file tree

Showing 4 changed files with 117 additions and 166 deletions.
diff --git a/Berksfile b/Berksfile
@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 #^syntax detection
-site :opscode
+source "http://api.berkshelf.com"
 
 # Misc
 cookbook 'mojolingo-misc', path: 'mojolingo-misc'
 cookbook 'apt'
-cookbook 'yum'
 
 # Asterisk
 cookbook 'asterisk', '~> 0.2.7'
@@ -14,9 +13,8 @@ cookbook 'unimrcp'
 # FreeSWITCH
 cookbook 'freeswitch', '~> 0.2'
 
-
 # Lumenvox
-cookbook 'lumenvox', github: 'mojolingo/lumenvox-chef'
+cookbook 'lumenvox', '~> 0.1'
 
 # Load test
 cookbook 'sipp'

diff --git a/Berksfile.lock b/Berksfile.lock
@@ -1,81 +1,62 @@
-{
-  "sources": {
-    "mojolingo-misc": {
-      "path": "./mojolingo-misc"
-    },
-    "apt": {
-      "locked_version": "2.3.0"
-    },
-    "yum": {
-      "locked_version": "2.4.4"
-    },
-    "asterisk": {
-      "locked_version": "0.2.7"
-    },
-    "unimrcp": {
-      "locked_version": "0.1.0"
-    },
-    "freeswitch": {
-      "locked_version": "0.3.2"
-    },
-    "java": {
-      "locked_version": "1.6.0"
-    },
-    "jmxsh": {
-      "locked_version": "1.0.1",
-      "git": "https://bitbucket.org/voxeolabs/jmxsh-chef",
-      "ref": "ee34c9ec589fdf649359db3e5182775ea3fdbe76"
-    },
-    "prism": {
-      "locked_version": "12.0.1",
-      "git": "https://bitbucket.org/voxeolabs/prism-chef.git",
-      "ref": "f1fce1e5ff9a083da5a714da550892e355e035a6"
-    },
-    "rayo": {
-      "locked_version": "1.1.0",
-      "git": "https://bitbucket.org/voxeolabs/rayo-chef.git",
-      "ref": "faefaff392f0e7ece7b8ab8b8d3172ed0d14172a"
-    },
-    "lumenvox": {
-      "locked_version": "0.0.2",
-      "git": "git://github.com/mojolingo/lumenvox-chef.git",
-      "ref": "1e65eb9083752e7b6a13d821c519e46edef3a71d"
-    },
-    "sipp": {
-      "locked_version": "1.0.1"
-    },
-    "sudo": {
-      "locked_version": "2.2.2"
-    },
-    "wav2rtp": {
-      "locked_version": "1.0.0"
-    },
-    "rbenv": {
-      "locked_version": "1.6.5"
-    },
-    "git": {
-      "locked_version": "2.7.0"
-    },
-    "dmg": {
-      "locked_version": "2.0.8"
-    },
-    "build-essential": {
-      "locked_version": "1.4.2"
-    },
-    "windows": {
-      "locked_version": "1.11.0"
-    },
-    "chef_handler": {
-      "locked_version": "1.1.4"
-    },
-    "runit": {
-      "locked_version": "1.4.0"
-    },
-    "ohai": {
-      "locked_version": "1.1.12"
-    },
-    "base": {
-      "locked_version": "0.1.0"
-    }
-  }
-}
+DEPENDENCIES
+  apt
+  asterisk (~> 0.2.7)
+  freeswitch (~> 0.2)
+  lumenvox (~> 0.1)
+  mojolingo-misc
+    path: mojolingo-misc
+  sipp
+  sudo
+  unimrcp
+  wav2rtp (~> 1.0)
+
+GRAPH
+  apt (2.3.10)
+  asterisk (0.2.7)
+    apt (~> 2.2)
+    unimrcp (~> 0.1)
+  build-essential (1.4.4)
+  chef_handler (1.1.6)
+  dmg (2.2.0)
+  freeswitch (0.6.4)
+    apt (~> 2.2)
+    yum (~> 3.1)
+  git (4.0.2)
+    build-essential (>= 0.0.0)
+    dmg (>= 0.0.0)
+    runit (>= 1.0.0)
+    windows (>= 0.0.0)
+    yum (~> 3.0)
+    yum-epel (>= 0.0.0)
+  java (1.22.0)
+  lumenvox (0.1.1)
+    yum (>= 0.0.0)
+    yum-repoforge (>= 0.0.0)
+  mojolingo-misc (0.0.0)
+    java (~> 1.6)
+    rbenv (>= 0.0.0)
+    sipp (~> 1.0)
+    wav2rtp (~> 1.0)
+  ohai (2.0.0)
+  rbenv (1.7.1)
+    apt (>= 0.0.0)
+    build-essential (>= 0.0.0)
+    git (>= 0.0.0)
+    ohai (>= 1.1)
+  runit (1.5.10)
+    build-essential (>= 0.0.0)
+    yum (~> 3.0)
+    yum-epel (>= 0.0.0)
+  sipp (1.0.1)
+  sudo (2.5.2)
+  unimrcp (0.2.0)
+    build-essential (~> 1.4)
+  wav2rtp (1.0.0)
+  windows (1.31.0)
+    chef_handler (>= 0.0.0)
+  yum (3.2.0)
+  yum-epel (0.3.6)
+    yum (~> 3.0)
+  yum-repoforge (0.2.0)
+    yum (~> 3.0)
+    yum-epel (>= 0.0.0)
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -25,52 +25,50 @@ GEM
       libxml-ruby (>= 1.1.0)
       rake (>= 0.7.0)
     Platform (0.4.0)
-    activesupport (3.2.15)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    addressable (2.3.5)
-    akami (1.2.0)
-      gyoku (>= 0.4.0)
-      nokogiri (>= 1.4.0)
+    addressable (2.3.6)
     ansi (1.3.0)
-    berkshelf (2.0.10)
-      activesupport (~> 3.2.0)
+    berkshelf (3.1.1)
       addressable (~> 2.3.4)
+      berkshelf-api-client (~> 1.2)
+      buff-config (~> 0.2)
+      buff-extensions (~> 0.4)
       buff-shell_out (~> 0.1)
-      chozo (>= 0.6.1)
-      faraday (>= 0.8.5)
-      hashie (>= 2.0.2)
+      celluloid (~> 0.16.0.pre)
+      celluloid-io (~> 0.16.0.pre)
+      faraday (~> 0.9.0)
       minitar (~> 0.5.4)
-      rbzip2 (~> 0.2.0)
+      octokit (~> 3.0)
       retryable (~> 1.3.3)
-      ridley (~> 1.5.0)
-      solve (>= 0.5.0)
-      thor (~> 0.18.0)
+      ridley (~> 3.1)
+      solve (~> 1.1)
+      thor (~> 0.18)
+    berkshelf-api-client (1.2.0)
+      faraday (~> 0.9.0)
     buff-config (0.4.0)
       buff-extensions (~> 0.3)
       varia_model (~> 0.1)
     buff-extensions (0.5.0)
-    buff-ignore (1.1.0)
+    buff-ignore (1.1.1)
     buff-ruby_engine (0.1.0)
-    buff-shell_out (0.1.0)
+    buff-shell_out (0.1.1)
       buff-ruby_engine (~> 0.1.0)
     builder (3.2.2)
-    celluloid (0.14.1)
-      timers (>= 1.0.0)
-    celluloid-io (0.14.1)
-      celluloid (>= 0.14.1)
-      nio4r (>= 0.4.5)
+    celluloid (0.16.0.pre)
+      timers (~> 2.0.0)
+    celluloid-io (0.16.0.pre)
+      celluloid (>= 0.16.0.pre)
+      nio4r (>= 1.0.0)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    chozo (0.6.1)
-      activesupport (>= 3.2.0)
-      hashie (>= 2.0.2)
-      multi_json (>= 1.3.0)
+    dep-selector-libgecode (1.0.0)
+    dep_selector (1.0.3)
+      dep-selector-libgecode (~> 1.0)
+      ffi (~> 1.9)
     diff-lcs (1.2.4)
     erubis (2.7.0)
     excon (0.27.6)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.0)
     fission (0.4.0)
       CFPropertyList (~> 2.0.17)
@@ -90,106 +88,79 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
       posix-spawn (~> 0.3.6)
-    gssapi (1.0.3)
-      ffi (>= 1.0.1)
-    gyoku (1.1.0)
-      builder (>= 2.1.2)
-    hashie (2.0.5)
+    hashie (2.1.1)
     highline (1.6.20)
-    httpclient (2.3.4.1)
-    httpi (0.9.7)
-      rack
+    hitimes (1.2.1)
     i18n (0.6.5)
     json (1.8.0)
     libxml-ruby (2.7.0)
-    little-plugger (1.1.3)
-    logging (1.8.1)
-      little-plugger (>= 1.1.3)
-      multi_json (>= 1.3.6)
     mime-types (1.25)
     mini_portile (0.5.1)
     minitar (0.5.4)
     mixlib-authentication (1.3.0)
       mixlib-log
     mixlib-log (1.6.0)
     multi_json (1.8.2)
-    multipart-post (1.2.0)
-    net-http-persistent (2.9)
+    multipart-post (2.0.0)
+    net-http-persistent (2.9.4)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.7.0)
-    nio4r (0.5.0)
+    nio4r (1.0.0)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
-    nori (1.1.5)
+    octokit (3.1.0)
+      sawyer (~> 0.5.3)
     open4 (1.3.0)
     os (0.9.6)
     popen4 (0.1.2)
       Platform (>= 0.4.0)
       open4 (>= 0.4.0)
     posix-spawn (0.3.6)
     progressbar (0.21.0)
-    rack (1.5.2)
     rake (10.1.0)
-    rbzip2 (0.2.0)
-    retryable (1.3.3)
-    ridley (1.5.3)
+    retryable (1.3.5)
+    ridley (3.1.0)
       addressable
       buff-config (~> 0.2)
       buff-extensions (~> 0.3)
       buff-ignore (~> 1.1)
       buff-shell_out (~> 0.1)
-      celluloid (~> 0.14.0)
-      celluloid-io (~> 0.14.0)
+      celluloid (~> 0.16.0.pre)
+      celluloid-io (~> 0.16.0.pre)
       erubis
-      faraday (>= 0.8.4)
+      faraday (~> 0.9.0)
       hashie (>= 2.0.2)
       json (>= 1.7.7)
       mixlib-authentication (>= 1.3.0)
       net-http-persistent (>= 2.8)
-      net-ssh
-      nio4r (>= 0.5.0)
       retryable
-      solve (>= 0.4.4)
-      varia_model (~> 0.1)
-      winrm (~> 1.1.0)
+      semverse (~> 1.1)
+      varia_model (~> 0.3)
     ruby-hmac (0.4.0)
     ruby-vnc (1.0.1)
-    rubyntlm (0.1.1)
     sane (0.25.6)
       os
-    savon (0.9.5)
-      akami (~> 1.0)
-      builder (>= 2.1.2)
-      gyoku (>= 0.4.0)
-      httpi (~> 0.9)
-      nokogiri (>= 1.4.0)
-      nori (~> 1.0)
-      wasabi (~> 1.0)
-    solve (0.8.1)
+    sawyer (0.5.4)
+      addressable (~> 2.3.5)
+      faraday (~> 0.8, < 0.10)
+    semverse (1.1.0)
+    solve (1.2.0)
+      dep_selector (~> 1.0)
+      semverse (~> 1.1)
     thor (0.18.1)
-    timers (1.1.0)
+    timers (2.0.0)
+      hitimes
     unicode (0.4.4)
-    uuidtools (2.1.4)
-    varia_model (0.2.0)
+    varia_model (0.3.2)
       buff-extensions (~> 0.2)
       hashie (>= 2.0.2)
-    wasabi (1.0.0)
-      nokogiri (>= 1.4.0)
     whichr (0.3.6)
       sane
-    winrm (1.1.3)
-      gssapi (~> 1.0.0)
-      httpclient (~> 2.2, >= 2.2.0.2)
-      logging (~> 1.6, >= 1.6.1)
-      nokogiri (~> 1.5)
-      rubyntlm (~> 0.1.1)
-      savon (= 0.9.5)
-      uuidtools (~> 2.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  berkshelf
+  berkshelf (~> 3.1)
   veewee!
diff --git a/mojolingo-misc/metadata.rb b/mojolingo-misc/metadata.rb
@@ -1,3 +1,4 @@
+name              "mojolingo-misc"
 maintainer        "Mojo Lingo LLC"
 maintainer_email  "ops@mojolingo.com"
 license           "MIT"