Skip to content

Commit

Permalink
Merge pull request #2 from ghitchens/cleanup_configuration
Browse files Browse the repository at this point in the history
elixir 1.4, remove nerves_networking dep
  • Loading branch information
ghitchens authored Feb 26, 2017
2 parents 61028b7 + 1510734 commit 81fd860
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 30 deletions.
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#Changelog

## v0.2.0-dev
## v0.2.1-dev

- removed unneeded dependency on nerves_networking
- elixir 1.4 dependency and removal of warnings

## v0.2.0

- updated metadata model entirely
- elixir 1.3 dependency
Expand All @@ -16,4 +21,4 @@

- initial commit to tie together functionality of other modules
- derived from cellulose.io's cell concept
- skeleton implementation primarily for demo purposes
- skeleton implementation primarily for demo purposes
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# Nerves.Cell

Network discoverable, manageable, updatable Nerves devices
Network discoverability, updatability, and metadata for devices

__Cell__ is an abstraction for a set of functionality that a Nerves device can
implement, the sum of which allows interesting remote management.
implement, the sum of which allows interesting remote management features.

## Current Feature Set

The current implementation is very preliminary, and relies on hardcoded ports
and device descriptions, which will be replaced in time as a more fleshed-out
service discovery architecture comes into play.

- LAN Device Annoucment (via SSDP for now, mDNS to follow)
- LAN Service Annoucment (hard coded for now)
- LAN Device Announcement (via SSDP for now, mDNS to follow)
- LAN Service Announcement (hard coded for now)
- LAN Firmware updates using [nerves_firmware_http](https://github.com/nerves-project/nerves_firmware_http)

For now, the primary objective of this module is to enable discovery,
Expand Down
10 changes: 1 addition & 9 deletions lib/nerves_cell.ex
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@ defmodule Nerves.Cell do
use Application
require Logger

@project Mix.Project.config

@ssdp_fields [
location: "http://localhost:3000/myservice.json",
server: "MyServerName",
"cache-control": "max-age=1800"
]

# See http://elixir-lang.org/docs/stable/elixir/Application.html
# for more information on OTP Applications
def start(_type, _args) do
Expand Down Expand Up @@ -80,4 +72,4 @@ defmodule Nerves.Cell do
end
end

end
end
16 changes: 8 additions & 8 deletions mix.exs
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
defmodule Nerves.Cell.Mixfile do

use Mix.Project

@version "0.2.0-dev"
@version "0.2.1-dev"

def project do
[ app: :nerves_cell,
name: "nerves_cell",
version: @version,
elixir: "~> 1.3",
elixir: "~> 1.4",
build_embedded: Mix.env == :prod,
start_permanent: Mix.env == :prod,
deps: deps(),
Expand All @@ -16,16 +17,15 @@ defmodule Nerves.Cell.Mixfile do
end

def application do
[ applications: [:logger, :nerves_networking, :nerves_firmware_http, :nerves_ssdp_server],
[ applications: [:logger, :nerves_firmware_http, :nerves_ssdp_server],
mod: {Nerves.Cell, []} ]
end

defp deps do
[ {:nerves_firmware_http, github: "nerves-project/nerves_firmware_http"},
{:nerves_networking, "~> 0.6.0"},
{:nerves_ssdp_server, "~> 0.2.1"},
{:nerves_ssdp_client, "~> 0.1.3", only: :test} ]
end
{:nerves_ssdp_server, ">= 0.0.1"},
{:nerves_ssdp_client, ">= 0.0.1", only: :test} ]
end

defp docs do
[ source_ref: "v#{@version}",
Expand All @@ -37,7 +37,7 @@ defmodule Nerves.Cell.Mixfile do
defp package do
[ maintainers: ["Garth Hitchens"],
licenses: ["Apache-2.0"],
links: %{github: "https://github.com/nerves-project/cell"},
links: %{github: "https://github.com/nerves-project/nerves_cell"},
files: ~w(lib config) ++ ~w(README.md CHANGELOG.md LICENSE mix.exs) ]
end
end
14 changes: 7 additions & 7 deletions mix.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
%{"cowboy": {:hex, :cowboy, "1.0.4", "a324a8df9f2316c833a470d918aaf73ae894278b8aa6226ce7a9bf699388f878", [:rebar, :make], [{:cowlib, "~> 1.0.0", [hex: :cowlib, optional: false]}, {:ranch, "~> 1.0", [hex: :ranch, optional: false]}]},
%{"cowboy": {:hex, :cowboy, "1.1.2", "61ac29ea970389a88eca5a65601460162d370a70018afe6f949a29dca91f3bb0", [:rebar3], [{:cowlib, "~> 1.0.2", [hex: :cowlib, optional: false]}, {:ranch, "~> 1.3.2", [hex: :ranch, optional: false]}]},
"cowlib": {:hex, :cowlib, "1.0.2", "9d769a1d062c9c3ac753096f868ca121e2730b9a377de23dec0f7e08b1df84ee", [:make], []},
"exjsx": {:hex, :exjsx, "3.2.0", "7136cc739ace295fc74c378f33699e5145bead4fdc1b4799822d0287489136fb", [:mix], [{:jsx, "~> 2.6.2", [hex: :jsx, optional: false]}]},
"jsx": {:hex, :jsx, "2.6.2", "213721e058da0587a4bce3cc8a00ff6684ced229c8f9223245c6ff2c88fbaa5a", [:mix, :rebar], []},
"nerves_firmware": {:git, "https://github.com/nerves-project/nerves_firmware.git", "241a12694bd3bc2b4df8cbb7e0f0beaeff075b1c", []},
"nerves_firmware_http": {:git, "https://github.com/nerves-project/nerves_firmware_http.git", "cc2cb110b0587a482d454175916dc597d62c4bfa", []},
"exjsx": {:hex, :exjsx, "3.2.1", "1bc5bf1e4fd249104178f0885030bcd75a4526f4d2a1e976f4b428d347614f0f", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, optional: false]}]},
"jsx": {:hex, :jsx, "2.8.2", "7acc7d785b5abe8a6e9adbde926a24e481f29956dd8b4df49e3e4e7bcc92a018", [:mix, :rebar3], []},
"nerves_firmware": {:git, "https://github.com/nerves-project/nerves_firmware.git", "b783df3867c82dc0abe6770079077a6f922c00a9", []},
"nerves_firmware_http": {:git, "https://github.com/nerves-project/nerves_firmware_http.git", "d8206a58ba7184bd8419080fc51d13543af705ca", []},
"nerves_networking": {:hex, :nerves_networking, "0.6.0", "6de5fc53951d087c8c61ce4ba74b998313e628ff084cd02c9813eb63a79c647f", [:mix], []},
"nerves_ssdp_client": {:hex, :nerves_ssdp_client, "0.1.3", "b09dc7433b2536399885a5f0fcd1fb58283115b075f9485f86fa713547d404dc", [:mix], []},
"nerves_ssdp_server": {:hex, :nerves_ssdp_server, "0.2.1", "2d010552023fc1a724e8cb5c92479a58552976e6f805b6dbf09babd31f923b8f", [:mix], []},
"ranch": {:hex, :ranch, "1.2.1", "a6fb992c10f2187b46ffd17ce398ddf8a54f691b81768f9ef5f461ea7e28c762", [:make], []}}
"nerves_ssdp_server": {:hex, :nerves_ssdp_server, "0.2.2", "30988caf00a175285a238fff83feccb1f662b9ac4fcc68805b2e9cc01dcf1ad8", [:mix], []},
"ranch": {:hex, :ranch, "1.3.2", "e4965a144dc9fbe70e5c077c65e73c57165416a901bd02ea899cfd95aa890986", [:rebar3], []}}

0 comments on commit 81fd860

Please sign in to comment.