nature_remo 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0fd6a7f7c874793188d8d6b122b91ba813e3dd4c5d9a86797c95a856e7f225e
-  data.tar.gz: d7bdaf9cba6b8953b9962d4b8de5bea5fef5ca32b64908f411ec57f53184fe96
+  metadata.gz: 5a60356bea96fa09e00aa147db2e9f91b0fcec96771ddd5e07bcf1c3fa231968
+  data.tar.gz: 23c7d98e040a99e0c2f8a7fa6fbb6d336148d0e324e59749f7b69fc2199cd62f
 SHA512:
-  metadata.gz: eff7363dd9cc0e1d534457c70e3d9e4eb19f1ec7f227ebd716d68e872ff57781b7fd580fada066edb6364274b0487347ccc27998c4045ce04a10b08c5d19eac4
-  data.tar.gz: cd5d733914c964db662b707bb40bb5bc1abc01797204eadfdb501c0abf91a085c3716a4e13e5e02fdd439c8ea678b364061219bf5a72a96e21d72a2037b081d4
+  metadata.gz: bbeb54be18aaa83484c83545af83abe97315780cca804696179fcc18be67c4055de6041490a34f2a1e2824dbfb4b5add3e563e8aee4ffd7ef17212cec15c9abb
+  data.tar.gz: dea3a7bd2cdba7d6f757de5b62df9734e9ef7b93f04f477635eb1d29cbac43fc455e37e5a53661d202c7658a0f39eee3d34ffa2953b8d6235dd2bfa8f143bf1c

data/.github/workflows/docker-publish.yml

@@ -0,0 +1,84 @@
+name: Docker
+
+on:
+  push:
+    branches: [ master ]
+    tags: [ 'v*.*.*' ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  REGISTRY: ghcr.io
+  # github.repository as <account>/<repo>
+  IMAGE_NAME: ${{ github.repository }}
+
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      # This is used to complete the identity challenge
+      # with sigstore/fulcio when running outside of PRs.
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Install the cosign tool except on PR
+      # https://github.com/sigstore/cosign-installer
+      - name: Install cosign
+        if: github.event_name != 'pull_request'
+        uses: sigstore/cosign-installer@d6a3abf1bdea83574e28d40543793018b6035605
+        with:
+          cosign-release: 'v1.7.1'
+
+
+      # Workaround: https://github.com/docker/build-push-action/issues/461
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
+
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Extract metadata (tags, labels) for Docker
+      # https://github.com/docker/metadata-action
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      # Build and push Docker image with Buildx (don't push on PR)
+      # https://github.com/docker/build-push-action
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      # Sign the resulting Docker image digest except on PRs.
+      # This will only write to the public Rekor transparency log when the Docker
+      # repository is public to avoid leaking data.  If you would like to publish
+      # transparency data even for private images, pass --force to cosign below.
+      # https://github.com/sigstore/cosign
+      - name: Sign the published Docker image
+        if: ${{ github.event_name != 'pull_request' }}
+        env:
+          COSIGN_EXPERIMENTAL: "true"
+        # This step uses the identity token to provision an ephemeral certificate
+        # against the sigstore community Fulcio instance.
+        run: cosign sign ${{ steps.meta.outputs.tags }}@${{ steps.build-and-push.outputs.digest }}

data/.github/workflows/ruby.yml

@@ -0,0 +1,33 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on: [push, pull_request]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.1.2']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      env:
+        NATURE_TOKEN: ${{ secrets.NATURE_TOKEN }}
+      run: bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.5.1
+- https://github.com/ichi-t/nature_remo/pull/22
+
 ## v0.4.0
 - make it possible to get **illumination** value
 

data/Dockerfile

@@ -0,0 +1,12 @@
+FROM ruby:3.1.2
+LABEL mainteiner="taisuke_ichimura@icloud.com"
+
+WORKDIR /app
+COPY ./ /app/
+
+RUN gem update --system && \
+    gem install bundler -v 2.3.14 && \
+    bundle _2.3.14_ install && \
+    bundle _2.3.14_ exec rake install:local
+
+ENTRYPOINT ["natureremo"]

data/Gemfile.lock

@@ -1,31 +1,33 @@
 PATH
   remote: .
   specs:
-    nature_remo (0.4.0)
-      faraday (~> 0.17.0)
-      launchy (~> 2.4.3)
-      thor (~> 0.20.3)
+    nature_remo (0.6.0)
+      faraday (~> 2.3.0)
+      launchy (~> 2.5.0)
+      thor (~> 1.2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    faraday (0.17.0)
-      multipart-post (>= 1.2, < 3)
-    hashdiff (1.0.0)
-    launchy (2.4.3)
-      addressable (~> 2.3)
-    minitest (5.13.0)
-    multipart-post (2.1.1)
-    public_suffix (4.0.1)
-    rake (13.0.1)
-    safe_yaml (1.0.5)
-    thor (0.20.3)
-    webmock (3.7.6)
-      addressable (>= 2.3.6)
+    crack (0.4.5)
+      rexml
+    faraday (2.3.0)
+      faraday-net_http (~> 2.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (2.0.3)
+    hashdiff (1.0.1)
+    launchy (2.5.0)
+      addressable (~> 2.7)
+    minitest (5.15.0)
+    public_suffix (4.0.7)
+    rake (13.0.6)
+    rexml (3.2.5)
+    ruby2_keywords (0.0.5)
+    thor (1.2.1)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
 
@@ -33,11 +35,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.0.2)
-  minitest (~> 5.13.0)
+  bundler (~> 2.3.14)
+  minitest (~> 5.15.0)
   nature_remo!
-  rake (~> 13.0.1)
-  webmock (~> 3.7.6)
+  rake (~> 13.0.6)
+  webmock (~> 3.14.0)
 
 BUNDLED WITH
-   2.0.2
+   2.3.14

data/README.md

@@ -1,6 +1,6 @@
 # NatureRemo
 
-[![Build Status](https://travis-ci.org/ichi-t/nature_remo.svg?branch=master)](https://travis-ci.org/ichi-t/nature_remo)
+[![Ruby](https://github.com/ichi-t/nature_remo/actions/workflows/ruby.yml/badge.svg?branch=master)](https://github.com/ichi-t/nature_remo/actions/workflows/ruby.yml)
 [![Gem Version](https://badge.fury.io/rb/nature_remo.svg)](https://badge.fury.io/rb/nature_remo)
 
 Nature Remo API client
@@ -60,6 +60,10 @@ client.send_signal(<signal id>, interval: 500, times: 10)
 	natureremo temp                  # Get temperature and humidity
 	natureremo illu                  # Get illumination
 
+### CLI with Docker
+
+	docker run --rm -e NATURE_TOKEN='<nature_token>' taisukeichimura/natureremo --help
+
 ### Example
 
 #### Control appliance
@@ -86,6 +90,12 @@ Send signal
 
 	$ natureremo aircon [temperature] [mode] [options]
 
+	$ natureremo aircon_off
+	$ natureremo aircon_on
+
+	$ natureremo aircon_change_temperature +1
+	$ natureremo aircon_change_temperature -1
+
 <!-- ## Development -->
 
 <!-- After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment. -->

data/lib/nature_remo/cli.rb

@@ -55,6 +55,60 @@ module NatureRemo
       end
     end
 
+    desc 'aircon_off', 'Turn off air conditioner'
+    def aircon_off()
+      aircon_id = []
+      appliances_body.each_with_index do |a, i|
+        aircon_id << get_appliance_id(i) if a['type'] == 'AC'
+      end
+
+      if aircon_id.length == 1
+        client.aircon_off aircon_id.first
+      else
+        puts 'This method supports only one air conditioner'
+      end
+    end
+
+    desc 'aircon_on', 'Turn on air conditioner'
+    def aircon_on()
+      aircon_id = []
+      appliances_body.each_with_index do |a, i|
+        aircon_id << get_appliance_id(i) if a['type'] == 'AC'
+      end
+
+      if aircon_id.length == 1
+        client.aircon_on aircon_id.first
+      else
+        puts 'This method supports only one air conditioner'
+      end
+    end
+
+    desc 'aircon_change_temperature', 'Change the temperature of the air conditioner'
+    def aircon_change_temperature(difference)
+      diff = difference.to_i
+      return if diff == 0
+
+      aircon_id = []
+      appliance = nil
+      appliances_body.each_with_index do |a, i|
+        appliance = a
+        aircon_id << get_appliance_id(i) if a['type'] == 'AC'
+      end
+
+      if aircon_id.length == 1
+        current_temperature = appliance["settings"]["temp"].to_i
+        if current_temperature != 0
+          client.aircon_setting aircon_id.first, current_temperature + diff
+
+          puts "Temperature set to #{current_temperature + diff}"
+        else
+          puts 'Could not retrieve the air conditioner currently set temperature'
+        end
+      else
+        puts 'This method supports only one air conditioner'
+      end
+    end
+
     desc 'temp', 'Get temperature and humidity'
     def temp
       value = client.events

data/lib/nature_remo/client.rb

@@ -46,6 +46,24 @@ module NatureRemo
       results
     end
 
+    def aircon_on(appliance)
+      @client.post do |req|
+        req.url "/1/appliances/#{appliance}/aircon_settings"
+        req.body = {
+          button: ""
+        }
+      end
+    end
+
+    def aircon_off(appliance)
+      @client.post do |req|
+        req.url "/1/appliances/#{appliance}/aircon_settings"
+        req.body = {
+          button: "power-off"
+        }
+      end
+    end
+
     def aircon_setting(appliance, temp = nil, mode = nil, volume = nil)
       @client.post do |req|
         req.url "/1/appliances/#{appliance}/aircon_settings"
@@ -57,8 +75,12 @@ module NatureRemo
       end
     end
 
+    def remo
+      JSON.parse(devices.body).find { |device| device['firmware_version'].match(/Remo\/\d+\.\d+\.\d+-[a-z0-9]+/) }
+    end
+
     def events
-      JSON.parse(devices.body)[0]['newest_events']
+      remo['newest_events']
     end
 
     def get_temp

data/lib/nature_remo/version.rb

@@ -1,3 +1,3 @@
 module NatureRemo
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/nature_remo.gemspec

@@ -29,11 +29,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 2.0.2'
-  spec.add_development_dependency 'minitest', '~> 5.13.0'
-  spec.add_development_dependency 'rake', '~> 13.0.1'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
-  spec.add_runtime_dependency 'faraday', '~> 0.17.0'
-  spec.add_runtime_dependency 'launchy', '~> 2.4.3'
-  spec.add_runtime_dependency 'thor', '~> 0.20.3'
+  spec.add_development_dependency 'bundler', '~> 2.3.14'
+  spec.add_development_dependency 'minitest', '~> 5.15.0'
+  spec.add_development_dependency 'rake', '~> 13.0.6'
+  spec.add_development_dependency 'webmock', '~> 3.14.0'
+  spec.add_runtime_dependency 'faraday', '~> 2.3.0'
+  spec.add_runtime_dependency 'launchy', '~> 2.5.0'
+  spec.add_runtime_dependency 'thor', '~> 1.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nature_remo
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - ichi-t
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,99 +16,99 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.3.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.3.14
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.13.0
+        version: 5.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.13.0
+        version: 5.15.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.6
+        version: 3.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.6
+        version: 3.14.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.3
-description: 
+        version: 1.2.1
+description:
 email:
 - taisuke_ichimura@icloud.com
 executables:
@@ -117,10 +117,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/workflows/docker-publish.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -136,7 +138,7 @@ homepage: https://github.com/ichi-t/nature_remo
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -151,8 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Nature Remo API client written by Ruby
 test_files: []

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5.0
-before_install: gem install bundler -v 1.16.1