Updated using BitBar v2 beta, including build dir

Author: robzr

build/build.sh

@@ -0,0 +1,69 @@
+#!/bin/bash
+
+DIR=~/github/ecobar
+BUILD_DIR=$DIR/build
+
+ICON_SRC=$BUILD_DIR/icon/ecoBar.icns
+DMG_SRC=$BUILD_DIR/src/ecoBar.dmg DMG_DEST="$DIR/ecoBar.dmg"
+DMG_TMP=/tmp/tmp-ecoBar.dmg
+MNT_DIR="/Volumes/ecoBar Installer"
+BBD_DIR="$BUILD_DIR/src/BitBarDistro.app"
+APP_DIR="$MNT_DIR/ecoBar.app"
+INST_DIR="$APP_DIR/Contents/MacOS"
+
+ECOBEE_DIR=~/github/ecobee/lib
+
+echo Converting DMG
+hdiutil detach "$MNT_DIR"
+#hdiutil convert "$DMG_SRC" -format UDRW -ov -o "$DMG_TMP"
+cp "$DMG_SRC" "$DMG_TMP"
+hdiutil attach "$DMG_TMP"
+
+#echo Removing old directories...
+#rm -rf "$INST_DIR/ecobee" "$INST_DIR/ecoBar.1m.rb" "$INST_DIR/eco_bar"
+
+echo Copying BitBarDistro
+rm -rf "$APP_DIR"
+rsync -a "$BBD_DIR"/ "$APP_DIR"
+
+echo Copying files in...
+rsync -a "$DIR/eco_bar" "$INST_DIR"
+cp "$DIR/ecoBar.rb" "$INST_DIR/ecoBar.1m.rb"
+rsync -a "$ECOBEE_DIR/" "$INST_DIR/ecobee"
+
+echo Unsigning...
+xattr -rc "$APP_DIR"
+codesign --deep --force --verbose --sign - "$APP_DIR"
+#echo Signing...
+#codesign --deep --force --verbose --sign "Mac Developer: rob@zwissler.org (M3AY8937F4)" "$APP_DIR"
+
+echo Applying icon
+# make icon it's own icon
+sips -i "$ICON_SRC"
+# extract to resource file
+DeRez -only icns "$ICON_SRC" > /tmp/icon.$$
+# append this resource to the file you want to icon-ize.
+Rez -append /tmp/icon.$$ -o "$APP_DIR"/$'Icon\r'
+# Use the resource to set the icon.
+#SetFile -a C "$APP_DIR"/Icon?
+SetFile -a C "$APP_DIR"/
+SetFile -a V "$APP_DIR"/$'Icon\r'
+rm /tmp/icon.$$
+
+echo Verifying sign...
+codesign --verify --verbose "$APP_DIR"
+
+sleep 3
+hdiutil detach "$MNT_DIR"
+#diskutil unmount "$MNT_DIR"
+sleep 2
+echo Converting...
+echo hdiutil convert "$DMG_TMP" -quiet -format UDZO -imagekey zlib-level=9 -ov -o "$DMG_DEST"
+hdiutil convert "$DMG_TMP" -format UDZO -imagekey zlib-level=9 -ov -o "$DMG_DEST"
+
+#hdiutil create $DIR/ecoBar.dmg -volname "ecoBar Installer" -srcfolder $DIR/build/image
+
+#Use hdiutil to attach the image
+#Use cp etc to copy the application into the mounted image
+#hdiutil detach
+#compress the image: hdiutil convert "in.dmg" -quiet -format UDZO -imagekey zlib-level=9 -o "MyApp-0.3.dmg"

build/icon/ecoBar.icns

@@ -19,6 +19,44 @@
 end
 require_relative 'eco_bar/eco_bar'
 
+# ENV: {"BitBarDarkMode"=>"1", "BitBar"=>"1", "BitBarVersion"=>"2.0.0-beta10"}
+REFRESH = 10
+
+def is_long_running?
+  ENV['BitBarVersion'] =~ /^[2-9]\./ && $0.sub(/.*\//, '').count('.') < 2
+end
+
+def write_single_output(ecobar)
+  ecobar.header
+  ecobar.setpoint_menu
+  ecobar.weather
+  ecobar.separator
+  ecobar.name_menu
+  ecobar.status
+  ecobar.mode_menu
+  ecobar.fan_mode
+  ecobar.sensors
+  ecobar.alerts
+  ecobar.separator
+  ecobar.website
+  ecobar.separator
+  ecobar.about
+end
+
+def write_output(ecobar)
+  if is_long_running?
+    loop do
+      write_single_output(ecobar)
+      puts '~~~'
+      STDOUT.flush
+      sleep REFRESH
+      ecobar = EcoBar::BarIO.new(index: @config['index'], token: @token)
+    end
+  else
+    write_single_output(ecobar)
+  end
+end
+
 case arg = ARGV.shift 
 when /^wipe_tokens/
   begin
@@ -106,18 +144,5 @@
 when /^set_fan_mode=/
   ecobar.thermostat.desired_fan_mode = arg.sub(/^.*=/, '')
 else
-  ecobar.header
-  ecobar.setpoint_menu
-  ecobar.weather
-  ecobar.separator
-  ecobar.name_menu
-  ecobar.status
-  ecobar.mode_menu
-  ecobar.fan_mode
-  ecobar.sensors
-  ecobar.alerts
-  ecobar.separator
-  ecobar.website
-  ecobar.separator
-  ecobar.about
+  write_output ecobar
 end

build/icon/menubar-30.png

@@ -74,9 +74,10 @@ def fan_mode
       render "Fan Mode: #{Ecobee::FanMode(thermostat.desired_fan_mode)}"
       Ecobee::FAN_MODES.each do |mode|
         if mode == thermostat.desired_fan_mode
-          render "--#{check true}#{Ecobee::FanMode(mode)}"
+          render("--#{Ecobee::FanMode(mode)}", checked: true)
         else
-          render("--#{check false}#{Ecobee::FanMode(mode)}",
+          render("--#{Ecobee::FanMode(mode)}",
+                 checked: false,
                  param1: "set_fan_mode=#{mode}",
                  run_self: true)
         end
@@ -95,9 +96,10 @@ def mode_menu
       render "Mode: #{Ecobee::Mode(thermostat.mode)}"
       Ecobee::HVAC_MODES.each do |mode|
         if mode == thermostat.mode
-          render "--#{check true}#{Ecobee::Mode(mode)}"
+          render("--#{Ecobee::Mode(mode)}", checked: true)
         else
-          render("--#{check false}#{Ecobee::Mode(mode)}",
+          render("--#{Ecobee::Mode(mode)}",
+                 checked: false,
                  param1: "set_mode=#{mode}",
                  run_self: true)
         end
@@ -111,9 +113,10 @@ def name_menu
           thermostat = @thermostats[index]
 
           if @index == index
-            render "--#{check true}#{thermostat.name} (#{thermostat.model})"
+            render("--#{thermostat.name} (#{thermostat.model})", checked: true)
           else
-            render("--#{check false}#{thermostat.name} (#{thermostat.model})",
+            render("--#{thermostat.name} (#{thermostat.model})",
+                   checked: false,
                    param1: "set_index=#{index}",
                    run_self: true)
           end
@@ -124,6 +127,13 @@ def name_menu
     def render(msg, arg = {})
       msg += '|'
       arg.merge!({:color => :dark}) unless arg[:color]
+      if ENV['BitBarVersion'] =~ /^2\./ && arg[:checked] == true
+        msg += " checked=true"
+      elsif arg[:checked] == true
+        msg.sub!(/^(-*)/, "\\1#{check true}")
+      elsif ENV['BitBarVersion'] =~ /^1\./ && arg[:checked] == false
+        msg.sub!(/^(-*)/, "\\1#{check false}")
+      end
       msg += " #{arg[:attrib]}" if arg.key? :attrib
       msg += " bash=\"#{arg[:bash]}\"" if arg.key? :bash
       msg += " #{color(arg[:color])}" if arg.key? :color
@@ -170,9 +180,10 @@ def setpoint_menu
     def setpoint_menu_cool
       thermostat.cool_range(with_delta: true).reverse_each do |temp|
         if temp == thermostat.desired_cool
-          render("--#{check true}#{temp}#{DEG}", color: :cold)
+          render("--#{temp}#{DEG}", checked: true, color: :cold)
         else
-          render("--#{check false}#{temp}#{DEG}",
+          render("--#{temp}#{DEG}",
+                 checked: false,
                  color: :cold,
                  param1: "set_cool=#{temp}",
                  run_self: true)
@@ -183,9 +194,10 @@ def setpoint_menu_cool
     def setpoint_menu_heat
       thermostat.heat_range(with_delta: true).reverse_each do |temp|
         if temp == thermostat.desired_heat
-          render("--#{check true}#{temp}#{DEG}", color: :hot)
+          render("--#{temp}#{DEG}", checked: true, color: :hot)
         else
-          render("--#{check false}#{temp}#{DEG}", 
+          render("--#{temp}#{DEG}", 
+                 checked: false,
                  color: :hot,
                  param1: "set_heat=#{temp}",
                  run_self: true)

build/icon/menubar.png

@@ -1,4 +1,4 @@
 module EcoBar
-  VERSION     = '0.1.11'
-  DMG_VERSION = '0.1.11'
+  VERSION     = '0.2.00'
+  DMG_VERSION = '0.2.00'
 end

ecoBar.dmg

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'pp'
+
+A = -> {|x| x + 1 }.freeze
+
+pp A[2]