robit 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0018e1ac3e0a77279b37a8d0ada8e4402d0d745
-  data.tar.gz: 443cb2c0c9786ee2482b699a3ae64930d33b2ec5
+  metadata.gz: 9b702f7fa566c81565dd9c50315a8f161c40d58c
+  data.tar.gz: 6cac2646b5cf23bde7311d601d29756e2bdf45a7
 SHA512:
-  metadata.gz: f83316c89feae1f27acb9b3e231fff73f9422fe4da80b2f8f5a22d4aeb88ac931a3374d4b1fc1d077a135328b52f9b80749d5af0a76e0909ff847182f2f9993b
-  data.tar.gz: 1ec3f23c331b5a31c590f6b2295a589f072c688ffb96db855fd9864e0dbc87dd250275bc290322dab729b1f404095739a59e2c02b70401393ae787e1994e3e1d
+  metadata.gz: 0449177e28d85571c163d5be9194d9bed9a250502b982612614217930d5a23edb529395e3931c20190b1bbc64e3aaa16b7e390c0dcd4890dcf731783f5a7bf6e
+  data.tar.gz: c2c9947dee3665287cc8021b88c9d348b89d684244e5942a10a58ebc5ae47405922c144e7a024c5927f4d2ece8507fbdba708573588afcd5fd566d4d3965a77e

data/.gitignore

@@ -6,6 +6,8 @@
 *.pid
 *.swp
 *.yml
+*.json
+*.lock
 .DS_Store
 .robit
 .robut_store
@@ -14,4 +16,5 @@
 Gemfile.lock
 doc
 pkg
-config.json
+config.json
+artifacts

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/lib/robit/plugins/alias_nick.rb

@@ -8,7 +8,7 @@ class String
   # Test => test
   # OpsOnly => ops_only
   def downcase_and_snakify
-    self.gsub(/\s+/,'').gsub(/([A-Z])/, '_\1').delete('@').sub(/^_/, '').downcase
+    self.gsub(/\s+/,'').gsub(/([A-Z])/, '_\1').gsub('-','_').delete('@').sub(/^_/, '').downcase
   end
 end
 
@@ -71,20 +71,21 @@ private
       from.inspect, mentions.inspect, message.inspect
     ]
 
+    return if from.include? reply_to.connection.config.nick # self
+
     tos = mentions.select { |m| db.keys.include? m }
 
 
     tos.each do |to|
       rooms = db[to]
 
+      rroom, hroom = nil, nil
       rooms.each do |name|
-        rroom, hroom = nil, nil
-
         if name =~ /^@/
-          rroom = robut_room name
-          raise if rroom.nil?
-          hroom = hipchat_room rroom.name
-          raise if hroom.nil?
+          rroom = robut_room name unless rroom
+          next if rroom.nil?
+          hroom = hipchat_room rroom.name unless hroom
+          next if hroom.nil?
         end
 
         subject = '%s mentioned "%s" in "%s"' % [
@@ -102,7 +103,13 @@ private
         end
       end
 
-      reply "Notified #{to_sentence rooms}." unless rooms.empty?
+      if rroom.nil?
+        reply "Sorry, I'm having trouble accessing the HipChat room..."
+      elsif rooms.empty?
+        reply "Sorry, I'm having trouble accessing HipChat rooms..."
+      else
+        reply "Notified #{to_sentence rooms}."
+      end
     end
   end
 
@@ -173,7 +180,8 @@ private
 
   def robut_room name
     robut_room = reply_to.connection.rooms.select do |r|
-      r.name =~ /^\d+_#{name.downcase_and_snakify}@/
+      room_name = r.name.gsub('-','_')
+      room_name =~ /^\d+_#{name.downcase_and_snakify}@/
     end.shift
   end
 

data/tasks/package/Dockerfile

@@ -1,10 +1,9 @@
 FROM sczizzo/trusty-tool:latest
 MAINTAINER Sean Clemmer <sczizzo@gmail.com>
+ENV DEBIAN_FRONTEND=noninteractive
 
 COPY . /build
 
-RUN cd /build \
- && /build/tasks/package/_package.sh \
- && rm -rf /build /tmp/* /var/lib/apt/lists/*
+RUN cd /build && /build/tasks/package/_package.sh /artifacts
 
 VOLUME /artifacts

data/tasks/package/_package.sh

@@ -2,13 +2,19 @@
 set -x
 set -e
 
+ARTIFACTS="${1:-artifacts}"
+
 ruby=ruby2.2
 version=$(cat VERSION)
 
+rm -rf doc
 rm -rf etc
 rm -rf tmp
 rm -rf .bundle
 rm -rf .vagrant
+rm -rf vendor
+rm -rf pkg
+mkdir -p pkg
 
 bundle update
 bundle package --all --all-platforms
@@ -25,8 +31,7 @@ bundle exec fpm -n robit \
 # gem uninstall -aIx
 # dpkg -i *.deb
 # ls -la /opt/robit
-# robit art
-# robit version
+# robit --help
 
-mkdir -p /artifacts
-mv *.deb /artifacts
+mkdir -p $ARTIFACTS
+mv *.deb $ARTIFACTS

data/tasks/package/run.sh

@@ -2,20 +2,22 @@
 set -x
 set -e
 
-project=$(basename `pwd`)
+project="$(basename `pwd`)"
 artifacts="${1:-tasks/package/artifacts}"
 dockerfile="${2:-tasks/package/Dockerfile}"
 task_name="${3:-$project-package-$(date +%s)}"
+base_image="$(grep '^FROM' "$dockerfile" | awk '{ print $2 }')"
 
 cleanup() {
   docker stop "$task_name"
   docker rm "$task_name"
+  docker rmi "$task_name"
 }
 
 trap cleanup EXIT
 
 rm -rf "$artifacts"
-docker pull sczizzo/trusty-tool:latest
+docker pull "$base_image"
 docker build -t "$task_name" -f "$dockerfile" .
 docker run --name "$task_name" -dt "$task_name"
 docker cp "$task_name":/artifacts "$artifacts"

data/tasks/test/Dockerfile

@@ -1,5 +1,6 @@
 FROM sczizzo/trusty-tool:latest
 MAINTAINER Sean Clemmer <sczizzo@gmail.com>
+ENV DEBIAN_FRONTEND=noninteractive
 
 COPY . /build
 

data/tasks/test/run.sh

@@ -5,6 +5,8 @@ set -e
 project=$(basename `pwd`)
 dockerfile="${1:-tasks/test/Dockerfile}"
 task_name="${2:-$project-test-$(date +%s)}"
+base_image="$(grep '^FROM' "$dockerfile" | awk '{ print $2 }')"
 
-docker pull sczizzo/trusty-tool:latest
+docker pull "$base_image"
 docker build -t "$task_name" -f "$dockerfile" .
+docker rmi "$task_name"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robit
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twss-classifier
@@ -147,7 +147,6 @@ files:
 - ".robit.nick.yml"
 - ".ruby-version"
 - Gemfile
-- Gemfile.lock
 - Rakefile
 - Readme.md
 - VERSION
@@ -159,7 +158,6 @@ files:
 - robit.gemspec
 - tasks/package/Dockerfile
 - tasks/package/_package.sh
-- tasks/package/artifacts/robit_1.0.4_amd64.deb
 - tasks/package/post-install.sh
 - tasks/package/robit.sh
 - tasks/package/run.sh

data/Gemfile.lock

@@ -1,93 +0,0 @@
-PATH
-  remote: .
-  specs:
-    robit (1.0.5)
-      awesome_print (~> 1)
-      calc (~> 1)
-      daybreak (~> 0)
-      hipchat (~> 1)
-      nokogiri (~> 1.5)
-      rubypress (~> 1)
-      sclemmer-robut (~> 0.6.3)
-      trollop (~> 2)
-      twss-classifier (~> 0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    arr-pm (0.0.10)
-      cabin (> 0)
-    awesome_print (1.6.1)
-    backports (3.6.8)
-    cabin (0.8.1)
-    calc (1.0.0)
-    childprocess (0.5.9)
-      ffi (~> 1.0, >= 1.0.11)
-    clamp (0.6.5)
-    coderay (1.1.0)
-    daybreak (0.3.0)
-    ffi (1.9.10)
-    fpm (1.4.0)
-      arr-pm (~> 0.0.10)
-      backports (>= 2.6.2)
-      cabin (>= 0.6.0)
-      childprocess
-      clamp (~> 0.6)
-      ffi
-      json (>= 1.7.7)
-    hipchat (1.5.2)
-      httparty
-      mimemagic
-    httparty (0.13.7)
-      json (~> 1.8)
-      multi_xml (>= 0.5.2)
-    json (1.8.3)
-    method_source (0.8.2)
-    mimemagic (0.3.1)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
-    multi_xml (0.5.5)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.6.4)
-    rack-protection (1.5.3)
-      rack
-    rake (10.5.0)
-    retryable-rb (1.1.0)
-    rubygems-tasks (0.2.4)
-    rubypress (1.2.0)
-      retryable-rb
-    sclemmer-robut (0.6.3)
-      sinatra (~> 1.3)
-      xmpp4r (~> 0.5.6)
-    sinatra (1.4.7)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    slop (3.6.0)
-    tilt (2.0.2)
-    trollop (2.1.2)
-    twss-classifier (0.0.1)
-    version (1.0.0)
-    xmpp4r (0.5.6)
-    yard (0.8.7.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  fpm
-  minitest
-  pry
-  rake
-  robit!
-  rubygems-tasks
-  version
-  yard
-
-BUNDLED WITH
-   1.11.2